Browse Source

Merge pull request #405 in FUI/fineui from ~LEI.WANG/fineui:master to master

* commit '4a6463e15756e23a6d1c0c313c83386778ad5a46':
  BI-21381 国际化
es6
guy 7 years ago
parent
commit
8e350d8b45
  1. 4
      dist/_fineui.min.js
  2. 4
      dist/base.js
  3. 7
      dist/bundle.js
  4. 4
      dist/bundle.min.js
  5. 7
      dist/fineui.js
  6. 4
      dist/fineui.min.js
  7. 3
      public/js/index.js
  8. 4
      src/base/sql/editor.sql.js
  9. 3
      ui/js/index.js

4
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/base.js vendored

@ -21418,7 +21418,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
lineNumbers: false
});
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
this.editor.on("change", function (cm, change) {
self._checkWaterMark();
if (o.showHint) {
@ -21444,7 +21444,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
// 水印
this.watermark = BI.createWidget({
type: "bi.label",
text: BI.i18nText("Please_Enter_SQL"),
text: BI.i18nText("BI-Please_Enter_SQL"),
cls: "bi-water-mark",
whiteSpace: "nowrap",
textAlign: "left"

7
dist/bundle.js vendored

@ -57184,7 +57184,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
lineNumbers: false
});
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
this.editor.on("change", function (cm, change) {
self._checkWaterMark();
if (o.showHint) {
@ -57210,7 +57210,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
// 水印
this.watermark = BI.createWidget({
type: "bi.label",
text: BI.i18nText("Please_Enter_SQL"),
text: BI.i18nText("BI-Please_Enter_SQL"),
cls: "bi-water-mark",
whiteSpace: "nowrap",
textAlign: "left"
@ -112791,5 +112791,6 @@ BI.i18n = {
"BI-Word_Align_Center": "文字居中",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于"
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL"
};

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui.js vendored

@ -57427,7 +57427,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
lineNumbers: false
});
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
this.editor.on("change", function (cm, change) {
self._checkWaterMark();
if (o.showHint) {
@ -57453,7 +57453,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
// 水印
this.watermark = BI.createWidget({
type: "bi.label",
text: BI.i18nText("Please_Enter_SQL"),
text: BI.i18nText("BI-Please_Enter_SQL"),
cls: "bi-water-mark",
whiteSpace: "nowrap",
textAlign: "left"
@ -113034,5 +113034,6 @@ BI.i18n = {
"BI-Word_Align_Center": "文字居中",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于"
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL"
};

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
public/js/index.js

@ -163,5 +163,6 @@ BI.i18n = {
"BI-Word_Align_Center": "文字居中",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于"
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL"
};

4
src/base/sql/editor.sql.js

@ -22,7 +22,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
lineNumbers: false
});
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
this.editor.on("change", function (cm, change) {
self._checkWaterMark();
if (o.showHint) {
@ -48,7 +48,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
// 水印
this.watermark = BI.createWidget({
type: "bi.label",
text: BI.i18nText("Please_Enter_SQL"),
text: BI.i18nText("BI-Please_Enter_SQL"),
cls: "bi-water-mark",
whiteSpace: "nowrap",
textAlign: "left"

3
ui/js/index.js

@ -163,5 +163,6 @@ BI.i18n = {
"BI-Word_Align_Center": "文字居中",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于"
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL"
};
Loading…
Cancel
Save