瀏覽代碼

[core] Show the correct type in the autocomplete menu

It will now show the correct type in the autocomplete suggestions, like "string", "map", "array" etc. instead of always showing "struct".
Johan Ahlen 10 年之前
父節點
當前提交
d7b231affb
共有 1 個文件被更改,包括 28 次插入15 次删除
  1. 28 15
      desktop/core/src/desktop/static/desktop/js/autocomplete.js

+ 28 - 15
desktop/core/src/desktop/static/desktop/js/autocomplete.js

@@ -61,31 +61,44 @@ Autocompleter.prototype.getTableReferenceIndex = function (statement) {
 
 Autocompleter.prototype.extractFields = function (data, valuePrefix, includeStar) {
   var fields = [];
-  var type;
-  var fieldNames = [];
+  var result = [];
+
   if (data.type == "struct") {
-    type = "struct";
-    fieldNames = $.map(data.fields, function(field) {
-      return field.name;
+    fields = $.map(data.fields, function(field) {
+      return {
+        name: field.name,
+        type: field.type
+      };
     });
   } else if (typeof data.columns != "undefined") {
-    type = "column";
-    fieldNames = data.columns;
+    fields = $.map(data.columns, function(column) {
+      return {
+        name: column,
+        type: "column"
+      }
+    });
     if (includeStar) {
-      fields.push({value: '*', score: 10000, meta: type});
+      result.push({value: '*', score: 10000, meta: "column"});
     }
   } else if (typeof data.tables != "undefined") {
-    type = "table";
-    fieldNames = data.tables;
+    fields = $.map(data.tables, function(table) {
+      return {
+        name: table,
+        type: "table"
+      }
+    });
   }
 
-  fieldNames.sort();
-  fieldNames.forEach(function(name, idx) {
-    if (name != "") {
-      fields.push({value: typeof valuePrefix != "undefined" ? valuePrefix + name : name, score: 1000 - idx, meta: type});
+  fields.sort(function (a, b) {
+    return a.name.localeCompare(b.name);
+  });
+
+  fields.forEach(function(field, idx) {
+    if (field.name != "") {
+      result.push({value: typeof valuePrefix != "undefined" ? valuePrefix + field.name : field.name, score: 1000 - idx, meta: field.type});
     }
   });
-  return fields;
+  return result;
 };
 
 Autocompleter.prototype.autocomplete = function(beforeCursor, afterCursor, callback) {