Merge pull request #266 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '6fae83970bcf51e8deeba80a898edb2e9b5ad588':
  更新更新

bi/base.css

@@ -591,6 +591,9 @@ span.CodeMirror-selectedtext {
   color: black;
   cursor: pointer;
 }
+.CodeMirror-hints {
+  z-index: 1000000000;
+}
 li.CodeMirror-hint-active {
   background: #08f;
   color: white;

bi/base.js

@@ -20737,13 +20737,11 @@ BI.Trigger = BI.inherit(BI.Single, {
       addMatches(result, search, tables, function(w) {return w});
       addMatches(result, search, defaultTable, function(w) {return w});
       if (!disableKeywords)
-        addMatches(result, search, keywords, function(w) {return w;});
+        addMatches(result, search, keywords, function(w, i) {
-        // 这边是加tooltip的，现在貌似不要了
+          var isKeyword = i < keywordsCount;
-        // addMatches(result, search, keywords, function(w, i) {
+          return {
-        //   var isKeyword = i < keywordsCount;
+            isKeyword: isKeyword,
-        //   return {
+            text: w
-        //     isKeyword: isKeyword,
-        //     text: w,
             // description: desc[w] || "SQL关键字",
             // className: isKeyword ? "sql-keyword" : "sql-fr-function",
             // render: function (Element, self, data) {
@@ -20756,8 +20754,8 @@ BI.Trigger = BI.inherit(BI.Single, {
             //     container: "body"
             //   });
             // }
-        //   };
+          };
-        // });
+        });
     }
 
     return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

dist/base.css

@@ -591,6 +591,9 @@ span.CodeMirror-selectedtext {
   color: black;
   cursor: pointer;
 }
+.CodeMirror-hints {
+  z-index: 1000000000;
+}
 li.CodeMirror-hint-active {
   background: #08f;
   color: white;

dist/base.js

@@ -20737,13 +20737,11 @@ BI.Trigger = BI.inherit(BI.Single, {
       addMatches(result, search, tables, function(w) {return w});
       addMatches(result, search, defaultTable, function(w) {return w});
       if (!disableKeywords)
-        addMatches(result, search, keywords, function(w) {return w;});
+        addMatches(result, search, keywords, function(w, i) {
-        // 这边是加tooltip的，现在貌似不要了
+          var isKeyword = i < keywordsCount;
-        // addMatches(result, search, keywords, function(w, i) {
+          return {
-        //   var isKeyword = i < keywordsCount;
+            isKeyword: isKeyword,
-        //   return {
+            text: w
-        //     isKeyword: isKeyword,
-        //     text: w,
             // description: desc[w] || "SQL关键字",
             // className: isKeyword ? "sql-keyword" : "sql-fr-function",
             // render: function (Element, self, data) {
@@ -20756,8 +20754,8 @@ BI.Trigger = BI.inherit(BI.Single, {
             //     container: "body"
             //   });
             // }
-        //   };
+          };
-        // });
+        });
     }
 
     return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

dist/bundle.css

@@ -2186,6 +2186,9 @@ span.CodeMirror-selectedtext {
   color: black;
   cursor: pointer;
 }
+.CodeMirror-hints {
+  z-index: 1000000000;
+}
 li.CodeMirror-hint-active {
   background: #08f;
   color: white;

dist/bundle.js

@@ -46549,13 +46549,11 @@ BI.Trigger = BI.inherit(BI.Single, {
       addMatches(result, search, tables, function(w) {return w});
       addMatches(result, search, defaultTable, function(w) {return w});
       if (!disableKeywords)
-        addMatches(result, search, keywords, function(w) {return w;});
+        addMatches(result, search, keywords, function(w, i) {
-        // 这边是加tooltip的，现在貌似不要了
+          var isKeyword = i < keywordsCount;
-        // addMatches(result, search, keywords, function(w, i) {
+          return {
-        //   var isKeyword = i < keywordsCount;
+            isKeyword: isKeyword,
-        //   return {
+            text: w
-        //     isKeyword: isKeyword,
-        //     text: w,
             // description: desc[w] || "SQL关键字",
             // className: isKeyword ? "sql-keyword" : "sql-fr-function",
             // render: function (Element, self, data) {
@@ -46568,8 +46566,8 @@ BI.Trigger = BI.inherit(BI.Single, {
             //     container: "body"
             //   });
             // }
-        //   };
+          };
-        // });
+        });
     }
 
     return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

src/base/sql/codemirrior/sql-hint.js

@@ -285,13 +285,11 @@
       addMatches(result, search, tables, function(w) {return w});
       addMatches(result, search, defaultTable, function(w) {return w});
       if (!disableKeywords)
-        addMatches(result, search, keywords, function(w) {return w;});
+        addMatches(result, search, keywords, function(w, i) {
-        // 这边是加tooltip的，现在貌似不要了
+          var isKeyword = i < keywordsCount;
-        // addMatches(result, search, keywords, function(w, i) {
+          return {
-        //   var isKeyword = i < keywordsCount;
+            isKeyword: isKeyword,
-        //   return {
+            text: w
-        //     isKeyword: isKeyword,
-        //     text: w,
             // description: desc[w] || "SQL关键字",
             // className: isKeyword ? "sql-keyword" : "sql-fr-function",
             // render: function (Element, self, data) {
@@ -304,8 +302,8 @@
             //     container: "body"
             //   });
             // }
-        //   };
+          };
-        // });
+        });
     }
 
     return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

src/css/base/formula/codemirror.css

@@ -471,6 +471,9 @@ span.CodeMirror-selectedtext {
   color: black;
   cursor: pointer;
 }
+.CodeMirror-hints {
+  z-index: 1000000000;
+}
 li.CodeMirror-hint-active {
   background: #08f;
   color: white;

src/less/base/formula/codemirror.less

@@ -579,7 +579,7 @@ span.CodeMirror-selectedtext {
 }
 
 .CodeMirror-hints {
-  //z-index: @zIndex-tip;
+  z-index: @zIndex-tip;
 }
 
 li.CodeMirror-hint-active {