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

Merge pull request #424 in FUI/fineui from ~WINDY/fui:master to master 

* commit '5c44ae4a29687a67fcf34be0cbc7a53de57600f7':
  更新
  BI-23104
  BI-23104
es6
guy 6 years ago
parent
fadc39241f 5c44ae4a29
commit
50e13b7cf7
9 changed files with 49 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      dist/_fineui.min.js
  2. 3
      dist/base.js
  3. 15
      dist/bundle.js
  4. 6
      dist/bundle.min.js
  5. 12
      dist/case.js
  6. 15
      dist/fineui.js
  7. 14
      dist/fineui.min.js
  8. 3
      src/base/sql/editor.sql.js
  9. 12
      src/case/combo/bubblecombo/popup.bubble.js

14
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/base.js vendored
Unescape View File

@ -21510,7 +21510,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.editor.getValue("\n", function (line) {
var v = this.editor.getValue("\n", function (line) {
var rawText = line.text, value = line.text, num = 0;
value.text = rawText;
_.forEach(_.sortBy(line.markedSpans, "from"), function (i, ms) {
@ -21528,6 +21528,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
});
return value;
});
return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
},
setValue: function (v) {

15
dist/bundle.js vendored
Unescape View File

@ -57276,7 +57276,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.editor.getValue("\n", function (line) {
var v = this.editor.getValue("\n", function (line) {
var rawText = line.text, value = line.text, num = 0;
value.text = rawText;
_.forEach(_.sortBy(line.markedSpans, "from"), function (i, ms) {
@ -57294,6 +57294,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
});
return value;
});
return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
},
setValue: function (v) {
@ -77977,21 +77978,21 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
},
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Sure"),
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, true);
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
}
}, {
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
value: BI.i18nText("BI-Basic_Sure"),
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, true);
}
}]
}
};
},
populate: function (v) {

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/case.js vendored
Unescape View File

@ -5499,21 +5499,21 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
},
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Sure"),
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, true);
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
}
}, {
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
value: BI.i18nText("BI-Basic_Sure"),
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, true);
}
}]
}
};
},
populate: function (v) {

15
dist/fineui.js vendored
Unescape View File

@ -57519,7 +57519,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.editor.getValue("\n", function (line) {
var v = this.editor.getValue("\n", function (line) {
var rawText = line.text, value = line.text, num = 0;
value.text = rawText;
_.forEach(_.sortBy(line.markedSpans, "from"), function (i, ms) {
@ -57537,6 +57537,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
});
return value;
});
return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
},
setValue: function (v) {
@ -78220,21 +78221,21 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
},
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Sure"),
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, true);
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
}
}, {
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
value: BI.i18nText("BI-Basic_Sure"),
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, true);
}
}]
}
};
},
populate: function (v) {

14
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/base/sql/editor.sql.js
Unescape View File

@ -112,7 +112,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.editor.getValue("\n", function (line) {
var v = this.editor.getValue("\n", function (line) {
var rawText = line.text, value = line.text, num = 0;
value.text = rawText;
_.forEach(_.sortBy(line.markedSpans, "from"), function (i, ms) {
@ -130,6 +130,7 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
});
return value;
});
return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
},
setValue: function (v) {

12
src/case/combo/bubblecombo/popup.bubble.js
Unescape View File

@ -155,21 +155,21 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
},
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Sure"),
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, true);
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
}
}, {
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
value: BI.i18nText("BI-Basic_Sure"),
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, true);
}
}]
}
};
},
populate: function (v) {

Write Preview
Loading…
Cancel
Save