Browse Source

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

* commit '6fae83970bcf51e8deeba80a898edb2e9b5ad588':
  更新更新
es6
windy 7 years ago
parent
commit
c05d72e38c
  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

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

40
bi/base.js

@ -20737,27 +20737,25 @@ 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;});
// 这边是加tooltip的,现在貌似不要了
// addMatches(result, search, keywords, function(w, i) {
// 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"
// });
// }
// };
// });
addMatches(result, search, keywords, function(w, i) {
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"
// });
// }
};
});
}
return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

3
dist/base.css vendored

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

40
dist/base.js vendored

@ -20737,27 +20737,25 @@ 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;});
// 这边是加tooltip的,现在貌似不要了
// addMatches(result, search, keywords, function(w, i) {
// 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"
// });
// }
// };
// });
addMatches(result, search, keywords, function(w, i) {
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"
// });
// }
};
});
}
return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

3
dist/bundle.css vendored

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

40
dist/bundle.js vendored

@ -46549,27 +46549,25 @@ 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;});
// 这边是加tooltip的,现在貌似不要了
// addMatches(result, search, keywords, function(w, i) {
// 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"
// });
// }
// };
// });
addMatches(result, search, keywords, function(w, i) {
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"
// });
// }
};
});
}
return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

18
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

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

@ -285,27 +285,25 @@
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;});
// 这边是加tooltip的,现在貌似不要了
// addMatches(result, search, keywords, function(w, i) {
// 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"
// });
// }
// };
// });
addMatches(result, search, keywords, function(w, i) {
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"
// });
// }
};
});
}
return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

3
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;

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 {

Loading…
Cancel
Save