Merge branch 'LinuxSuRen:master' into master

Author: user-xixiboliya

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

@@ -3,11 +3,13 @@ import { ref, watch } from 'vue'
 import { API } from './net'
 import type { QueryObject } from './net'
 import type { Store } from './store'
+import { Driver, GetDriverName, ExtensionKind } from './store'
 import type { Pair } from './types'
 import { GetDataManagerPreference, SetDataManagerPreference } from './cache'
 import { ElMessage } from 'element-plus'
 import { Codemirror } from 'vue-codemirror'
-import { sql, StandardSQL } from "@codemirror/lang-sql"
+import { sql, StandardSQL, MySQL, PostgreSQL, Cassandra } from "@codemirror/lang-sql"
+import type { SQLConfig } from "@codemirror/lang-sql"
 import HistoryInput from '../components/HistoryInput.vue'
 import type { Ref } from 'vue'
 import { Refresh, Document } from '@element-plus/icons-vue'
@@ -47,14 +49,27 @@ const storeChangedEvent = (s: string) => {
   stores.value.forEach((e: Store) => {
     if (e.name === s) {
       kind.value = e.kind.name
+      switch (GetDriverName(e)){
+        case Driver.MySQL:
+          sqlConfig.value.dialect = MySQL
+          break;
+        case Driver.Postgres:
+          sqlConfig.value.dialect = PostgreSQL
+          break;
+        case Driver.Cassandra:
+          sqlConfig.value.dialect = Cassandra
+          break;
+        default:
+          sqlConfig.value.dialect = StandardSQL
+      }
       return
     }
   })
 
   switch (kind.value) {
-    case 'atest-store-elasticsearch':
-    case 'atest-store-etcd':
-    case 'atest-store-redis':
+    case ExtensionKind.ExtensionKindElasticsearch:
+    case ExtensionKind.ExtensionKindEtcd:
+    case ExtensionKind.ExtensionKindRedis:
       sqlQuery.value = '*'
       complexEditor.value = false
       break
@@ -89,7 +104,7 @@ const queryDataFromTable = (data: QueryData) => {
 }
 const describeTable = (data: QueryData) => {
   switch (kind.value) {
-    case 'atest-store-cassandra':
+    case ExtensionKind.ExtensionKindCassandra:
       sqlQuery.value = `@describeTable_${queryDataMeta.value.currentDatabase}:${data.label}`
       break
     default:
@@ -102,17 +117,17 @@ const queryTables = () => {
 }
 watch(kind, (k) => {
   switch (k) {
-    case 'atest-store-orm':
-    case 'atest-store-cassandra':
-    case 'atest-store-iotdb':
+    case ExtensionKind.ExtensionKindORM:
+    case ExtensionKind.ExtensionKindCassandra:
+    case ExtensionKind.ExtensionKindIotDB:
       queryTip.value = 'Enter SQL query'
       executeQuery()
       break;
-    case 'atest-store-etcd':
-    case 'atest-store-redis':
+    case ExtensionKind.ExtensionKindEtcd:
+    case ExtensionKind.ExtensionKindRedis:
       queryTip.value = 'Enter key'
       break;
-    case 'atest-store-elasticsearch':
+    case ExtensionKind.ExtensionKindElasticsearch:
       queryTip.value = 'field:value OR field:other'
       break;
   }
@@ -139,6 +154,7 @@ API.GetStores((data) => {
   loadingStores.value = false
 })
 
+const showNativeSQL = ref(true)
 const ormDataHandler = (data: QueryData) => {
   const result = [] as any[]
   const cols = new Set<string>()
@@ -154,7 +170,7 @@ const ormDataHandler = (data: QueryData) => {
 
   columns.value = [] as string[]
   data.meta.labels = data.meta.labels.filter((item) => {
-    if (item.key === '_native_sql') {
+    if (showNativeSQL.value && item.key === '_native_sql') {
       sqlQuery.value = item.value
       return false
     }
@@ -196,20 +212,20 @@ const keyValueDataHandler = (data: QueryData) => {
     })
   })
 }
-
 const sqlConfig = ref({
   dialect: StandardSQL,
   defaultSchema: queryDataMeta.value.currentDatabase,
   upperCaseKeywords: true,
   schema: {}
-})
+} as SQLConfig)
 
 const executeQuery = async () => {
+  showNativeSQL.value = true
   if (sqlQuery.value === '') {
     switch (kind.value) {
-      case 'atest-store-elasticsearch':
-      case 'atest-store-etcd':
-      case 'atest-store-redis':
+      case ExtensionKind.ExtensionKindElasticsearch:
+      case ExtensionKind.ExtensionKindEtcd:
+      case ExtensionKind.ExtensionKindRedis:
         if (sqlQuery.value === '') {
           sqlQuery.value = '*'
         }
@@ -227,16 +243,16 @@ const executeWithQuery = async (sql: string) => {
   try {
     const data = await API.DataQueryAsync(query.value);
     switch (kind.value) {
-      case 'atest-store-orm':
-      case 'atest-store-cassandra':
-      case 'atest-store-iotdb':
-      case 'atest-store-opengemini':
-      case 'atest-store-elasticsearch':
+      case ExtensionKind.ExtensionKindORM:
+      case ExtensionKind.ExtensionKindCassandra:
+      case ExtensionKind.ExtensionKindIotDB:
+      case ExtensionKind.ExtensionKindOpengeMini:
+      case ExtensionKind.ExtensionKindElasticsearch:
         ormDataHandler(data)
         success = true
         break;
-      case 'atest-store-etcd':
-      case 'atest-store-redis':
+      case ExtensionKind.ExtensionKindEtcd:
+      case ExtensionKind.ExtensionKindRedis:
         keyValueDataHandler(data)
         break;
       default:
@@ -277,6 +293,13 @@ Magic.AdvancedKeys([{
   Keys: ['Ctrl+E', 'Ctrl+Enter'],
   Func: executeQuery,
   Description: 'Execute query'
+}, {
+  Keys: ['Ctrl+Shift+O'],
+  Func: () => {
+    showNativeSQL.value = false
+    executeWithQuery(sqlQuery.value)
+  },
+  Description: 'Execute query without showing native SQL'
 }])
 </script>
 

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, reactive } from 'vue'
+import { ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import { Edit, Delete, Search, CopyDocument, Help } from '@element-plus/icons-vue'
 import JsonViewer from 'vue-json-viewer'
@@ -20,9 +20,7 @@ import jsonlint from 'jsonlint-mod'
 
 import CodeMirror from 'codemirror'
 import { json, jsonLanguage } from "@codemirror/lang-json"
-import { LanguageSupport } from "@codemirror/language"
-import { CompletionContext } from "@codemirror/autocomplete"
-import type { Completion } from "@codemirror/autocomplete"
+import { NewLanguageComplete } from './languageComplete'
 import 'codemirror/lib/codemirror.css'
 import 'codemirror/addon/merge/merge.js'
 import 'codemirror/addon/merge/merge.css'
@@ -34,36 +32,7 @@ window.DIFF_DELETE = -1;
 window.DIFF_INSERT = 1;
 window.DIFF_EQUAL = 0;
 
-const templateFuncs = ref([] as Completion[])
-function myCompletions(context: CompletionContext) {
-  if (templateFuncs.value.length == 0) {
-    API.FunctionsQuery("", "template", (e) => {
-      if (e.data) {
-        e.data.forEach((item: any) => {
-          templateFuncs.value.push({
-            label: item.key,
-            type: "text",
-          } as Completion)
-        })
-      }
-    })
-  }
-
-  let word = context.matchBefore(/\w*/) || {
-    from: "",
-    to: ""
-  }
-  if (word.from == word.to && !context.explicit)
-    return null
-  return {
-    from: word.from,
-    options: templateFuncs.value
-  }
-}
-const jsonComplete = new LanguageSupport(jsonLanguage, jsonLanguage.data.of(
-  {autocomplete: myCompletions}
-))
-
+const jsonComplete = NewLanguageComplete(jsonLanguage)
 const { t } = useI18n()
 
 const props = defineProps({

console/atest-ui/src/views/languageComplete.ts

@@ -0,0 +1,38 @@
+import { Language, LanguageSupport } from "@codemirror/language"
+import { CompletionContext } from "@codemirror/autocomplete"
+import type { Completion } from "@codemirror/autocomplete"
+import { API } from './net'
+import { ref } from 'vue'
+
+const templateFuncs = ref([] as Completion[])
+function tplFuncCompletions(context: CompletionContext) {
+  if (templateFuncs.value.length == 0) {
+    API.FunctionsQuery("", "template", (e) => {
+      if (e.data) {
+        e.data.forEach((item: any) => {
+          templateFuncs.value.push({
+            label: item.key,
+            type: "text",
+          } as Completion)
+        })
+      }
+    })
+  }
+
+  let word = context.matchBefore(/\w*/) || {
+    from: "",
+    to: ""
+  }
+  if (word.from == word.to && !context.explicit)
+    return null
+  return {
+    from: word.from,
+    options: templateFuncs.value
+  }
+}
+
+export const NewLanguageComplete = (lang: Language) => {
+    return new LanguageSupport(lang, lang.data.of(
+        {autocomplete: tplFuncCompletions}
+    ))
+}

console/atest-ui/src/views/store.ts

@@ -23,12 +23,57 @@ export interface Store {
     name: string;
     description: string;
   };
+  properties: Pair[];
   params: Pair[];
 }
 
+const MySQL = "mysql";
+const Postgres = "postgres";
+const SQLite = "sqlite";
+const TDengine = "tdengine";
+const Cassandra = "cassandra";
+
+export const GetDriverName = (store: Store): string => {
+    switch (store.kind.name) {
+    case 'atest-store-orm':
+        return store.properties.find((p: Pair) => p.key === 'driver')?.value || MySQL;
+    case 'atest-store-cassandra':
+        return Cassandra;
+    }
+    return ""
+}
+
+export const Driver = {
+    MySQL, Postgres, SQLite, TDengine, Cassandra
+}
+
+const ExtensionKindGit = "atest-store-git"
+const ExtensionKindS3 = "atest-store-s3"
+const ExtensionKindORM = "atest-store-orm"
+const ExtensionKindIotDB = "atest-store-iotdb"
+const ExtensionKindCassandra = "atest-store-cassandra"
+const ExtensionKindEtcd = "atest-store-etcd"
+const ExtensionKindRedis = "atest-store-redis"
+const ExtensionKindMongoDB = "atest-store-mongodb"
+const ExtensionKindElasticsearch = "atest-store-elasticsearch"
+const ExtensionKindOpengeMini = "atest-store-opengemini"
+
+export const ExtensionKind = {
+    ExtensionKindGit,
+    ExtensionKindS3,
+    ExtensionKindORM,
+    ExtensionKindIotDB,
+    ExtensionKindCassandra,
+    ExtensionKindEtcd,
+    ExtensionKindRedis,
+    ExtensionKindMongoDB,
+    ExtensionKindElasticsearch,
+    ExtensionKindOpengeMini
+}
+
 const storeExtensions = [
     {
-        name: 'atest-store-git',
+        name: ExtensionKindGit,
         params: [{
             key: 'insecure'
         }, {
@@ -47,7 +92,7 @@ const storeExtensions = [
         link: 'https://github.com/LinuxSuRen/atest-ext-store-git'
     },
     {
-        name: 'atest-store-s3',
+        name: ExtensionKindS3,
         params: [{
             key: 'accesskeyid'
         }, {
@@ -66,11 +111,11 @@ const storeExtensions = [
         link: 'https://github.com/LinuxSuRen/atest-ext-store-s3'
     },
     {
-        name: 'atest-store-orm',
+        name: ExtensionKindORM,
         params: [{
             key: 'driver',
             defaultValue: 'mysql',
-            enum: ['mysql', 'postgres', 'sqlite', 'tdengine'],
+            enum: [MySQL, Postgres, SQLite, TDengine],
             description: 'Supported: mysql, postgres, sqlite, tdengine'
         }, {
             key: 'database',
@@ -84,30 +129,30 @@ const storeExtensions = [
         link: 'https://github.com/LinuxSuRen/atest-ext-store-orm'
     },
     {
-        name: 'atest-store-iotdb',
+        name: ExtensionKindIotDB,
         params: [],
         link: 'https://github.com/LinuxSuRen/atest-ext-store-iotdb'
     },
     {
-        name: 'atest-store-cassandra',
+        name: ExtensionKindCassandra,
         params: [{
             key: 'keyspace',
             defaultValue: ''
         }],
         link: 'https://github.com/LinuxSuRen/atest-ext-store-cassandra'
     },
     {
-        name: 'atest-store-etcd',
+        name: ExtensionKindEtcd,
         params: [],
         link: 'https://github.com/LinuxSuRen/atest-ext-store-etcd'
     },
     {
-        name: 'atest-store-redis',
+        name: ExtensionKindRedis,
         params: [],
         link: 'https://github.com/LinuxSuRen/atest-ext-store-redis'
     },
     {
-        name: 'atest-store-mongodb',
+        name: ExtensionKindMongoDB,
         params: [{
             key: 'collection'
         }, {
@@ -117,12 +162,12 @@ const storeExtensions = [
         link: 'https://github.com/LinuxSuRen/atest-ext-store-mongodb'
     },
     {
-        name: 'atest-store-elasticsearch',
+        name: ExtensionKindElasticsearch,
         params: [],
         link: 'https://github.com/LinuxSuRen/atest-ext-store-elasticsearch'
     },
     {
-        name: 'atest-store-opengemini',
+        name: ExtensionKindOpengeMini,
         params: [],
         link: 'https://github.com/LinuxSuRen/atest-ext-store-opengemini'
     }