Browse Source

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

* commit 'e19fa47fd9577af5cd0d94b877ffd91916cbfc6f':
  BI-17924 down_list_combo
  BI-17924 search_text_value_combo加个事件
  BI-17924 formulaeditor支持默认value
es6
guy 7 years ago
parent
commit
e97a11077a
  1. 40
      dist/_fineui.min.js
  2. 3
      dist/base.js
  3. 16
      dist/bundle.js
  4. 66
      dist/bundle.min.js
  5. 8
      dist/case.js
  6. 43
      dist/fineui.min.js
  7. 5
      dist/widget.js
  8. 3
      src/base/formula/formulaeditor.js
  9. 8
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  10. 3
      src/widget/downlist/popup.downlist.js
  11. 2
      src/widget/dynamicdatetime/dynamicdatetime.trigger.js

40
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/base.js vendored

@ -14606,6 +14606,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
},
_checkWaterMark: function () {

16
dist/bundle.js vendored

@ -49860,6 +49860,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
},
_checkWaterMark: function () {
@ -77661,9 +77664,14 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function(){
action: function () {
self.trigger.stopEditing();
}
}, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () {
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
}
}],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
@ -77711,6 +77719,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);/**
* Created by Windy on 2018/2/5.
*/
@ -89378,7 +89387,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
},
_createChildren: function (items) {
var self = this, result = [];
BI.each(items, function (i, it) {
// 不能修改populate进来的item的引用
BI.each(BI.deepClone(items), function (i, it) {
var item_done = {
type: "bi.down_list_group",
items: []
@ -91614,7 +91624,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour|| 0, value.minute || 0,
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour || 0, value.minute || 0,
value.second || 0).print("%Y-%X-%d %H:%M:%S");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);

66
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/case.js vendored

@ -5728,9 +5728,14 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function(){
action: function () {
self.trigger.stopEditing();
}
}, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () {
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
}
}],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
@ -5778,6 +5783,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);/**
* Created by Windy on 2018/2/5.
*/

43
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/widget.js vendored

@ -2862,7 +2862,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
},
_createChildren: function (items) {
var self = this, result = [];
BI.each(items, function (i, it) {
// 不能修改populate进来的item的引用
BI.each(BI.deepClone(items), function (i, it) {
var item_done = {
type: "bi.down_list_group",
items: []
@ -5098,7 +5099,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour|| 0, value.minute || 0,
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour || 0, value.minute || 0,
value.second || 0).print("%Y-%X-%d %H:%M:%S");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);

3
src/base/formula/formulaeditor.js

@ -88,6 +88,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
},
_checkWaterMark: function () {

8
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -63,9 +63,14 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
},
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function(){
action: function () {
self.trigger.stopEditing();
}
}, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () {
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
}
}],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
@ -113,4 +118,5 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);

3
src/widget/downlist/popup.downlist.js

@ -75,7 +75,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
},
_createChildren: function (items) {
var self = this, result = [];
BI.each(items, function (i, it) {
// 不能修改populate进来的item的引用
BI.each(BI.deepClone(items), function (i, it) {
var item_done = {
type: "bi.down_list_group",
items: []

2
src/widget/dynamicdatetime/dynamicdatetime.trigger.js

@ -201,7 +201,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
this.editor.setValue("");
this.setTitle("");
} else {
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour|| 0, value.minute || 0,
var dateStr = BI.getDate(value.year, (value.month - 1), value.day, value.hour || 0, value.minute || 0,
value.second || 0).print("%Y-%X-%d %H:%M:%S");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);

Loading…
Cancel
Save