fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

去tooltip去标色

es6
windy 7 years ago
parent
fb92e10479
commit
8fd7006604
9 changed files with 99 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      bi/base.css
  2. 40
      bi/base.js
  3. 10
      dist/base.css
  4. 40
      dist/base.js
  5. 10
      dist/bundle.css
  6. 40
      dist/bundle.js
  7. 40
      src/base/sql/codemirrior/sql-hint.js
  8. 10
      src/css/base/sql/sql.css
  9. 11
      src/less/base/sql/sql.less

10
bi/base.css
Unescape View File

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

40
bi/base.js
Unescape View File

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

10
dist/base.css vendored
Unescape View File

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

40
dist/base.js vendored
Unescape View File

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

10
dist/bundle.css vendored
Unescape View File

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

40
dist/bundle.js vendored
Unescape View File

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

40
src/base/sql/codemirrior/sql-hint.js
Unescape View File

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

10
src/css/base/sql/sql.css
Unescape View File

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

11
src/less/base/sql/sql.less
Unescape View File

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