Merge pull request #209 in FUI/fineui from ~GUY/fineui:master to master

* commit '62a1a9768635cd0523009e17565eb15a46fb4a89':
  update
  更新更新
  ie下造成 popup向下偏移
  update
  去tooltip去标色
  update
  sqleditor换位置

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;
@@ -1034,24 +1037,20 @@ body .bi-button.button-ignore.disabled.clear:active,
   border: 1px solid #f4cbcb;
 }
 .bi-sql-editor .cm-s-default span[class*="#"] {
-  color: #faaa39;
+  color: #3685f2;
 }
 .bi-sql-editor .cm-s-default .cm-keyword {
   color: #3685f2;
 }
 .bi-sql-editor .cm-s-default .cm-function {
-  color: #faaa39;
+  color: #3685f2;
 }
 .CodeMirror-hints .sql-fr-function {
-  color: #faaa39;
+  color: #3685f2;
 }
 .CodeMirror-hints .sql-keyword {
   color: #3685f2;
 }
-.CodeMirror-hints .CodeMirror-hint-active {
-  background: #3f8ce8;
-  color: #ffffff;
-}
 .bi-collection-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/

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;
@@ -1034,24 +1037,20 @@ body .bi-button.button-ignore.disabled.clear:active,
   border: 1px solid #f4cbcb;
 }
 .bi-sql-editor .cm-s-default span[class*="#"] {
-  color: #faaa39;
+  color: #3685f2;
 }
 .bi-sql-editor .cm-s-default .cm-keyword {
   color: #3685f2;
 }
 .bi-sql-editor .cm-s-default .cm-function {
-  color: #faaa39;
+  color: #3685f2;
 }
 .CodeMirror-hints .sql-fr-function {
-  color: #faaa39;
+  color: #3685f2;
 }
 .CodeMirror-hints .sql-keyword {
   color: #3685f2;
 }
-.CodeMirror-hints .CodeMirror-hint-active {
-  background: #3f8ce8;
-  color: #ffffff;
-}
 .bi-collection-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/

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;
@@ -2629,24 +2632,20 @@ body .bi-button.button-ignore.disabled.clear:active,
   border: 1px solid #f4cbcb;
 }
 .bi-sql-editor .cm-s-default span[class*="#"] {
-  color: #faaa39;
+  color: #3685f2;
 }
 .bi-sql-editor .cm-s-default .cm-keyword {
   color: #3685f2;
 }
 .bi-sql-editor .cm-s-default .cm-function {
-  color: #faaa39;
+  color: #3685f2;
 }
 .CodeMirror-hints .sql-fr-function {
-  color: #faaa39;
+  color: #3685f2;
 }
 .CodeMirror-hints .sql-keyword {
   color: #3685f2;
 }
-.CodeMirror-hints .CodeMirror-hint-active {
-  background: #3f8ce8;
-  color: #ffffff;
-}
 .bi-collection-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/

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

@@ -289,19 +289,19 @@
           var isKeyword = i < keywordsCount;
           return {
             isKeyword: isKeyword,
-            text: w,
-            description: desc[w] || "SQL关键字",
-            className: isKeyword ? "sql-keyword" : "sql-fr-function",
-            render: function (Element, self, data) {
-              var label = BI.createWidget({
-                type: "bi.label",
-                element: Element,
-                text: data.displayText || getText(data)
-              });
-              label.setTitle(data.description, {
-                container: "body"
-              });
-            }
+            text: w
+            // description: desc[w] || "SQL关键字",
+            // className: isKeyword ? "sql-keyword" : "sql-fr-function",
+            // render: function (Element, self, data) {
+            //   var label = BI.createWidget({
+            //     type: "bi.label",
+            //     element: Element,
+            //     text: data.displayText || getText(data)
+            //   });
+            //   label.setTitle(data.description, {
+            //     container: "body"
+            //   });
+            // }
           };
         });
     }

src/css/base/combo/popup.bubble.css

@@ -1,5 +1,3 @@
 .bi-bubble-popup-view {
-  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+
 }

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/css/base/sql/sql.css

@@ -1,19 +1,15 @@
 .bi-sql-editor .cm-s-default span[class*="#"] {
-  color: #faaa39;
+  color: #3685f2;
 }
 .bi-sql-editor .cm-s-default .cm-keyword {
   color: #3685f2;
 }
 .bi-sql-editor .cm-s-default .cm-function {
-  color: #faaa39;
+  color: #3685f2;
 }
 .CodeMirror-hints .sql-fr-function {
-  color: #faaa39;
+  color: #3685f2;
 }
 .CodeMirror-hints .sql-keyword {
   color: #3685f2;
 }
-.CodeMirror-hints .CodeMirror-hint-active {
-  background: #3f8ce8;
-  color: #ffffff;
-}

src/less/base/combo/popup.bubble.less

@@ -1,5 +1,6 @@
 @import "../../bibase";
 
+// ie下造成popup向下偏移
 .bi-bubble-popup-view {
-  .box-shadow(0 0 10px, rgba(0, 0, 0, 0.2));
+
 }

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 {

src/less/base/sql/sql.less

@@ -3,7 +3,7 @@
 .bi-sql-editor{
 
   & .cm-s-default span[class*="#"] {
-    color: @color-bi-text-warning;
+    color: @color-bi-text-highlight;
   }
 
   & .cm-s-default .cm-keyword {
@@ -11,22 +11,17 @@
   }
 
   & .cm-s-default .cm-function {
-    color: @color-bi-text-warning;
+    color: @color-bi-text-highlight;
   }
 
 }
 
 .CodeMirror-hints {
   & .sql-fr-function{
-    color: @color-bi-text-warning;
+    color: @color-bi-text-highlight;
   }
 
   & .sql-keyword{
     color: @color-bi-text-highlight;
   }
-
-  .CodeMirror-hint-active {
-    background: @color-bi-background-highlight;
-    color: @color-bi-text;
-  }
 }