caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

es6
windy 6 years ago
parent
0909ccd45e
commit
da914ec5c9
3 changed files with 78 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 61
      dist/bundle.js
  2. 61
      dist/fineui.js
  3. 61
      dist/widget.js

61
dist/bundle.js vendored
Unescape View File

@ -97841,23 +97841,23 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self._setStartValue(""); self._setStartValue("");
}); });
this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () { this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
if (this.getSearcher().hasMatched()) { // if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword(); var keyword = this.getSearcher().getKeyword();
self._join({ self._join({
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: [keyword] value: [keyword]
}, function () { }, function () {
// 如果在不选的状态下直接把该值添加进来 // 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) { if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword); self.storeValue.value.pushDistinct(keyword);
} }
self.combo.setValue(self.storeValue); self.combo.setValue(self.storeValue);
self._setStartValue(keyword); self._setStartValue(keyword);
assertShowValue(); assertShowValue();
self.populate(); self.populate();
self._setStartValue(""); self._setStartValue("");
}); });
} // }
}); });
this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) { this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
var last = BI.last(keywords); var last = BI.last(keywords);
@ -99374,17 +99374,6 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
height: this.constants.height height: this.constants.height
}); });
this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height,
handler: function () {
self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
}
});
this.loader = BI.createWidget({ this.loader = BI.createWidget({
type: "bi.multi_select_search_loader", type: "bi.multi_select_search_loader",
keywordGetter: o.keywordGetter, keywordGetter: o.keywordGetter,
@ -99405,20 +99394,23 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.vtape", type: "bi.vtape",
element: this, element: this,
items: [{ items: [{
type: "bi.center_adapt", el: this.tooltipClick,
items: [this.tooltipClick, this.addNotMatchTip], height: 0
height: this.constants.height
}, { }, {
el: this.loader el: this.loader
}] }]
}); });
this.tooltipClick.setVisible(false);
}, },
setKeyword: function (keyword) { setKeyword: function (keyword) {
var btn; var btn;
var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue()); var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
this.tooltipClick.setVisible(isMatchTipVisible); if (isVisible !== this.tooltipClick.isVisible()) {
this.addNotMatchTip.setVisible(!isMatchTipVisible); this.tooltipClick.setVisible(isVisible);
this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
this.resizer.resize();
}
}, },
isAllSelected: function () { isAllSelected: function () {
@ -99447,7 +99439,6 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
}); });
BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE"; BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/** BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
* 查看已选按钮 * 查看已选按钮

61
dist/fineui.js vendored
Unescape View File

@ -98084,23 +98084,23 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self._setStartValue(""); self._setStartValue("");
}); });
this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () { this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
if (this.getSearcher().hasMatched()) { // if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword(); var keyword = this.getSearcher().getKeyword();
self._join({ self._join({
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: [keyword] value: [keyword]
}, function () { }, function () {
// 如果在不选的状态下直接把该值添加进来 // 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) { if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword); self.storeValue.value.pushDistinct(keyword);
} }
self.combo.setValue(self.storeValue); self.combo.setValue(self.storeValue);
self._setStartValue(keyword); self._setStartValue(keyword);
assertShowValue(); assertShowValue();
self.populate(); self.populate();
self._setStartValue(""); self._setStartValue("");
}); });
} // }
}); });
this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) { this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
var last = BI.last(keywords); var last = BI.last(keywords);
@ -99617,17 +99617,6 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
height: this.constants.height height: this.constants.height
}); });
this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height,
handler: function () {
self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
}
});
this.loader = BI.createWidget({ this.loader = BI.createWidget({
type: "bi.multi_select_search_loader", type: "bi.multi_select_search_loader",
keywordGetter: o.keywordGetter, keywordGetter: o.keywordGetter,
@ -99648,20 +99637,23 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.vtape", type: "bi.vtape",
element: this, element: this,
items: [{ items: [{
type: "bi.center_adapt", el: this.tooltipClick,
items: [this.tooltipClick, this.addNotMatchTip], height: 0
height: this.constants.height
}, { }, {
el: this.loader el: this.loader
}] }]
}); });
this.tooltipClick.setVisible(false);
}, },
setKeyword: function (keyword) { setKeyword: function (keyword) {
var btn; var btn;
var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue()); var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
this.tooltipClick.setVisible(isMatchTipVisible); if (isVisible !== this.tooltipClick.isVisible()) {
this.addNotMatchTip.setVisible(!isMatchTipVisible); this.tooltipClick.setVisible(isVisible);
this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
this.resizer.resize();
}
}, },
isAllSelected: function () { isAllSelected: function () {
@ -99690,7 +99682,6 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
}); });
BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE"; BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/** BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
* 查看已选按钮 * 查看已选按钮

61
dist/widget.js vendored
Unescape View File

@ -10274,23 +10274,23 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self._setStartValue(""); self._setStartValue("");
}); });
this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () { this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
if (this.getSearcher().hasMatched()) { // if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword(); var keyword = this.getSearcher().getKeyword();
self._join({ self._join({
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: [keyword] value: [keyword]
}, function () { }, function () {
// 如果在不选的状态下直接把该值添加进来 // 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) { if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword); self.storeValue.value.pushDistinct(keyword);
} }
self.combo.setValue(self.storeValue); self.combo.setValue(self.storeValue);
self._setStartValue(keyword); self._setStartValue(keyword);
assertShowValue(); assertShowValue();
self.populate(); self.populate();
self._setStartValue(""); self._setStartValue("");
}); });
} // }
}); });
this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) { this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
var last = BI.last(keywords); var last = BI.last(keywords);
@ -11807,17 +11807,6 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
height: this.constants.height height: this.constants.height
}); });
this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height,
handler: function () {
self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
}
});
this.loader = BI.createWidget({ this.loader = BI.createWidget({
type: "bi.multi_select_search_loader", type: "bi.multi_select_search_loader",
keywordGetter: o.keywordGetter, keywordGetter: o.keywordGetter,
@ -11838,20 +11827,23 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.vtape", type: "bi.vtape",
element: this, element: this,
items: [{ items: [{
type: "bi.center_adapt", el: this.tooltipClick,
items: [this.tooltipClick, this.addNotMatchTip], height: 0
height: this.constants.height
}, { }, {
el: this.loader el: this.loader
}] }]
}); });
this.tooltipClick.setVisible(false);
}, },
setKeyword: function (keyword) { setKeyword: function (keyword) {
var btn; var btn;
var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue()); var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
this.tooltipClick.setVisible(isMatchTipVisible); if (isVisible !== this.tooltipClick.isVisible()) {
this.addNotMatchTip.setVisible(!isMatchTipVisible); this.tooltipClick.setVisible(isVisible);
this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
this.resizer.resize();
}
}, },
isAllSelected: function () { isAllSelected: function () {
@ -11880,7 +11872,6 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
}); });
BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE"; BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/** BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
* 查看已选按钮 * 查看已选按钮

Write Preview
Loading…
Cancel
Save