Browse Source

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

* commit '228200cd16473d77224b4af0a2df183b84345699':
  filter_expander的问题
es6
guy 7 years ago
parent
commit
e2c543a281
  1. 22
      dist/_fineui.min.js
  2. 4
      dist/base.js
  3. 9
      dist/bundle.js
  4. 10
      dist/bundle.min.js
  5. 3
      dist/case.js
  6. 22
      dist/fineui.min.js
  7. 2
      dist/widget.js
  8. 4
      src/base/combination/expander.js
  9. 3
      src/case/richeditor/richeditor.js
  10. 2
      src/widget/filter/expander/filter.expander.js

22
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/base.js vendored

@ -3615,9 +3615,7 @@ BI.Expander = BI.inherit(BI.Widget, {
}, },
_initExpander: function () { _initExpander: function () {
this.expander = BI.createWidget(this.options.el, { this.expander = BI.createWidget(this.options.el);
value: this.options.value
});
}, },
_assertPopupView: function () { _assertPopupView: function () {

9
dist/bundle.js vendored

@ -38876,9 +38876,7 @@ BI.Expander = BI.inherit(BI.Widget, {
}, },
_initExpander: function () { _initExpander: function () {
this.expander = BI.createWidget(this.options.el, { this.expander = BI.createWidget(this.options.el);
value: this.options.value
});
}, },
_assertPopupView: function () { _assertPopupView: function () {
@ -83072,6 +83070,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.NicEditor.EVENT_FOCUS, eventName: BI.NicEditor.EVENT_FOCUS,
action: function () { action: function () {
if(!self.combo.isViewVisible()) {
self.combo.showView();
}
self.fireEvent(BI.RichEditor.EVENT_FOCUS); self.fireEvent(BI.RichEditor.EVENT_FOCUS);
} }
}] }]
@ -92794,7 +92795,7 @@ BI.extend(BI.AbstractFilterItem, {
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var value = o.value, text = ""; var value = o.el.value, text = "";
if (value === BI.Filter.FILTER_TYPE.AND) { if (value === BI.Filter.FILTER_TYPE.AND) {
text = BI.i18nText("BI-Basic_And"); text = BI.i18nText("BI-Basic_And");
} else { } else {

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/case.js vendored

@ -11130,6 +11130,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.NicEditor.EVENT_FOCUS, eventName: BI.NicEditor.EVENT_FOCUS,
action: function () { action: function () {
if(!self.combo.isViewVisible()) {
self.combo.showView();
}
self.fireEvent(BI.RichEditor.EVENT_FOCUS); self.fireEvent(BI.RichEditor.EVENT_FOCUS);
} }
}] }]

22
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/widget.js vendored

@ -6284,7 +6284,7 @@ BI.extend(BI.AbstractFilterItem, {
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var value = o.value, text = ""; var value = o.el.value, text = "";
if (value === BI.Filter.FILTER_TYPE.AND) { if (value === BI.Filter.FILTER_TYPE.AND) {
text = BI.i18nText("BI-Basic_And"); text = BI.i18nText("BI-Basic_And");
} else { } else {

4
src/base/combination/expander.js

@ -129,9 +129,7 @@ BI.Expander = BI.inherit(BI.Widget, {
}, },
_initExpander: function () { _initExpander: function () {
this.expander = BI.createWidget(this.options.el, { this.expander = BI.createWidget(this.options.el);
value: this.options.value
});
}, },
_assertPopupView: function () { _assertPopupView: function () {

3
src/case/richeditor/richeditor.js

@ -28,6 +28,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.NicEditor.EVENT_FOCUS, eventName: BI.NicEditor.EVENT_FOCUS,
action: function () { action: function () {
if(!self.combo.isViewVisible()) {
self.combo.showView();
}
self.fireEvent(BI.RichEditor.EVENT_FOCUS); self.fireEvent(BI.RichEditor.EVENT_FOCUS);
} }
}] }]

2
src/widget/filter/expander/filter.expander.js

@ -17,7 +17,7 @@
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var value = o.value, text = ""; var value = o.el.value, text = "";
if (value === BI.Filter.FILTER_TYPE.AND) { if (value === BI.Filter.FILTER_TYPE.AND) {
text = BI.i18nText("BI-Basic_And"); text = BI.i18nText("BI-Basic_And");
} else { } else {

Loading…
Cancel
Save