Browse Source

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

* commit 'e1ce1b8b4858a33ac956203b509eb5e4d50f22a7':
  update
  update
  BI-18690 insert_combo默认值
es6
guy 7 years ago
parent
commit
e6324a5c4a
  1. 2
      demo/js/widget/multiselect/demo.multi_select_combo.js
  2. 18
      dist/_fineui.min.js
  3. 4
      dist/bundle.js
  4. 4
      dist/bundle.min.js
  5. 2
      dist/demo.js
  6. 18
      dist/fineui.min.js
  7. 4
      dist/widget.js
  8. 2
      src/widget/multiselect/multiselect..insert.combo.js

2
demo/js/widget/multiselect/demo.multi_select_combo.js

@ -9,7 +9,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () { _createMultiSelectCombo: function () {
var self = this; var self = this;
var widget = BI.createWidget({ var widget = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_insert_combo",
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
width: 200, width: 200,
value: { value: {

18
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored

@ -97192,7 +97192,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self.trigger.getSearcher().setState(self.storeValue); self.trigger.getSearcher().setState(self.storeValue);
self.trigger.getCounter().setButtonChecked(self.storeValue); self.trigger.getCounter().setButtonChecked(self.storeValue);
}; };
this.storeValue = {}; this.storeValue = o.value || {};
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;
@ -109416,7 +109416,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
}, },
getKey: function () { getKey: function () {
return this.yearEditor.getState() + "-" + this.monthEditor.getState(); return this.yearEditor.getValue() + "-" + this.monthEditor.getValue();
} }
}); });
BI.DynamicYearMonthTrigger.EVENT_VALID = "EVENT_FOCUS"; BI.DynamicYearMonthTrigger.EVENT_VALID = "EVENT_FOCUS";

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/demo.js vendored

@ -12712,7 +12712,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () { _createMultiSelectCombo: function () {
var self = this; var self = this;
var widget = BI.createWidget({ var widget = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_insert_combo",
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
width: 200, width: 200,
value: { value: {

18
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -10045,7 +10045,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self.trigger.getSearcher().setState(self.storeValue); self.trigger.getSearcher().setState(self.storeValue);
self.trigger.getCounter().setButtonChecked(self.storeValue); self.trigger.getCounter().setButtonChecked(self.storeValue);
}; };
this.storeValue = {}; this.storeValue = o.value || {};
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;
@ -22269,7 +22269,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
}, },
getKey: function () { getKey: function () {
return this.yearEditor.getState() + "-" + this.monthEditor.getState(); return this.yearEditor.getValue() + "-" + this.monthEditor.getValue();
} }
}); });
BI.DynamicYearMonthTrigger.EVENT_VALID = "EVENT_FOCUS"; BI.DynamicYearMonthTrigger.EVENT_VALID = "EVENT_FOCUS";

2
src/widget/multiselect/multiselect..insert.combo.js

@ -23,7 +23,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self.trigger.getSearcher().setState(self.storeValue); self.trigger.getSearcher().setState(self.storeValue);
self.trigger.getCounter().setButtonChecked(self.storeValue); self.trigger.getCounter().setButtonChecked(self.storeValue);
}; };
this.storeValue = {}; this.storeValue = o.value || {};
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;

Loading…
Cancel
Save