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

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

* commit '6fae83970bcf51e8deeba80a898edb2e9b5ad588':
  更新更新
es6
windy 7 years ago
parent
79e5ea709e 6fae83970b
commit
c05d72e38c
11 changed files with 99 additions and 95 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. 3
      bi/base.css
  2. 40
      bi/base.js
  3. 3
      dist/base.css
  4. 40
      dist/base.js
  5. 3
      dist/bundle.css
  6. 40
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 18
      dist/bundle.min.js
  9. 40
      src/base/sql/codemirrior/sql-hint.js
  10. 3
      src/css/base/formula/codemirror.css
  11. 2
      src/less/base/formula/codemirror.less

3
bi/base.css
Unescape View File

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

40
bi/base.js
Unescape View File

@ -20737,27 +20737,25 @@ 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) {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, // description: desc[w] || "SQL关键字",
// text: w, // className: isKeyword ? "sql-keyword" : "sql-fr-function",
// description: desc[w] || "SQL关键字", // render: function (Element, self, data) {
// className: isKeyword ? "sql-keyword" : "sql-fr-function", // var label = BI.createWidget({
// render: function (Element, self, data) { // type: "bi.label",
// var label = BI.createWidget({ // element: Element,
// type: "bi.label", // text: data.displayText || getText(data)
// element: Element, // });
// text: data.displayText || getText(data) // label.setTitle(data.description, {
// }); // 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)};

3
dist/base.css vendored
Unescape View File

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

40
dist/base.js vendored
Unescape View File

@ -20737,27 +20737,25 @@ 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) {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, // description: desc[w] || "SQL关键字",
// text: w, // className: isKeyword ? "sql-keyword" : "sql-fr-function",
// description: desc[w] || "SQL关键字", // render: function (Element, self, data) {
// className: isKeyword ? "sql-keyword" : "sql-fr-function", // var label = BI.createWidget({
// render: function (Element, self, data) { // type: "bi.label",
// var label = BI.createWidget({ // element: Element,
// type: "bi.label", // text: data.displayText || getText(data)
// element: Element, // });
// text: data.displayText || getText(data) // label.setTitle(data.description, {
// }); // 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)};

3
dist/bundle.css vendored
Unescape View File

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

40
dist/bundle.js vendored
Unescape View File

@ -46549,27 +46549,25 @@ 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) {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, // description: desc[w] || "SQL关键字",
// text: w, // className: isKeyword ? "sql-keyword" : "sql-fr-function",
// description: desc[w] || "SQL关键字", // render: function (Element, self, data) {
// className: isKeyword ? "sql-keyword" : "sql-fr-function", // var label = BI.createWidget({
// render: function (Element, self, data) { // type: "bi.label",
// var label = BI.createWidget({ // element: Element,
// type: "bi.label", // text: data.displayText || getText(data)
// element: Element, // });
// text: data.displayText || getText(data) // label.setTitle(data.description, {
// }); // 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)};

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -285,27 +285,25 @@
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) {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, // description: desc[w] || "SQL关键字",
// text: w, // className: isKeyword ? "sql-keyword" : "sql-fr-function",
// description: desc[w] || "SQL关键字", // render: function (Element, self, data) {
// className: isKeyword ? "sql-keyword" : "sql-fr-function", // var label = BI.createWidget({
// render: function (Element, self, data) { // type: "bi.label",
// var label = BI.createWidget({ // element: Element,
// type: "bi.label", // text: data.displayText || getText(data)
// element: Element, // });
// text: data.displayText || getText(data) // label.setTitle(data.description, {
// }); // 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)};

3
src/css/base/formula/codemirror.css
Unescape View File

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

2
src/less/base/formula/codemirror.less
Unescape View File

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

Write Preview
Loading…
Cancel
Save