feat: Optimize the effect of intelligent completion of table names

JerryFan626 · JerryFan626 · commit 9ef5f0c86af2 · 2023-10-13T10:59:15.000+08:00
diff --git a/chat2db-client/src/utils/IntelliSense/field.ts b/chat2db-client/src/utils/IntelliSense/field.ts
@@ -50,8 +50,6 @@ const registerIntelliSenseField = (tableList: string[], dataSourceId, databaseNa
   intelliSenseField = monaco.languages.registerCompletionItemProvider('sql', {
     triggerCharacters: [' ', '.', '('],
     provideCompletionItems: async (model, position) => {
-      console.log('registerIntelliSenseField');
-
       // 获取到当前行文本
       const textUntilPosition = model.getValueInRange({
         startLineNumber: position.lineNumber,
@@ -61,8 +59,8 @@ const registerIntelliSenseField = (tableList: string[], dataSourceId, databaseNa
       });
 
       const isFieldContext = checkFieldContext(textUntilPosition);
-
       const match = textUntilPosition.match(/(\b\w+\b)[^\w]*$/);
+
       let word;
       if (match) {
         word = match[1];
@@ -73,7 +71,6 @@ const registerIntelliSenseField = (tableList: string[], dataSourceId, databaseNa
         return; // 如果没有匹配到，直接返回
       }
       if (word && tableList.includes(word) && !fieldList[word]) {
-        console.log('registerIntelliSenseField start word');
         const data = await sqlService.getAllFieldByTable({
           dataSourceId,
           databaseName,
@@ -83,7 +80,7 @@ const registerIntelliSenseField = (tableList: string[], dataSourceId, databaseNa
         fieldList[word] = data;
       }
 
-      const suggestions = Object.keys(fieldList).reduce((acc, cur) => {
+      const suggestions: monaco.languages.CompletionItem[] = Object.keys(fieldList).reduce((acc, cur) => {
         const arr = fieldList[cur].map((fieldObj) => ({
           label: {
             label: fieldObj.name,
diff --git a/chat2db-client/src/utils/IntelliSense/table.ts b/chat2db-client/src/utils/IntelliSense/table.ts
@@ -13,8 +13,19 @@ let intelliSenseTable = monaco.languages.registerCompletionItemProvider('sql', {
 
 /** 根据不同的数据库，插入不同的表名  */
 const handleInsertText = (text, databaseCode: DatabaseTypeCode = DatabaseTypeCode.MYSQL) => {
-  if (databaseCode === DatabaseTypeCode.POSTGRESQL) {
-    return `${text}`;
+  if (
+    [
+      DatabaseTypeCode.POSTGRESQL,
+      DatabaseTypeCode.ORACLE,
+      DatabaseTypeCode.DB2,
+      DatabaseTypeCode.SQLITE,
+    ].includes(databaseCode)
+  ) {
+    return `\"${text}\"`;
+  } else if([DatabaseTypeCode.SQLSERVER].includes(databaseCode)){
+    return `[${text}]`;
+  } else if ([DatabaseTypeCode.MYSQL].includes(databaseCode)) {
+    return `\`${text}\``;
   } else {
     return `${text}`;
   }
@@ -69,7 +80,7 @@ const registerIntelliSenseTable = (
             kind: monaco.languages.CompletionItemKind.Variable,
             insertText: handleInsertText(tableName.name, databaseCode),
             // range: monaco.Range.fromPositions(position),
-            documentation: tableName.comment,
+            // documentation: tableName.comment,
             sortText: (isTableContext ? '01' : '02') + tableName.name,
             command: {
               id: 'addFieldList',
