Browse Source

BI-24064

master
windy 7 years ago
parent
commit
52429c0d61
  1. 1
      demo/js/widget/downlist/demo.downlist.js
  2. 48
      dist/_fineui.min.js
  3. 24
      dist/base.css
  4. 1
      dist/base.js
  5. 72
      dist/bundle.css
  6. 45
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 48
      dist/bundle.min.js
  9. 20
      dist/case.js
  10. 106
      dist/demo.js
  11. 72
      dist/fineui.css
  12. 45
      dist/fineui.js
  13. 2
      dist/fineui.min.css
  14. 48
      dist/fineui.min.js
  15. 48
      dist/widget.css
  16. 24
      dist/widget.js
  17. 1
      src/base/single/button/buttons/button.js
  18. 18
      src/case/button/icon/icon.trigger.js
  19. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  20. 12
      src/css/base/combo/combo.css
  21. 12
      src/css/base/trigger/trigger.css
  22. 24
      src/css/widget/multiselect/multiselect.css
  23. 12
      src/css/widget/multitree/multi.css
  24. 12
      src/css/widget/singleselect/multiselect.css
  25. 14
      src/less/base/combo/combo.searchtextvalue.less
  26. 15
      src/less/base/trigger/trigger.less
  27. 5
      src/less/widget/downlist/combo.downlist.less
  28. 14
      src/less/widget/multiselect/multiselect.combo.less
  29. 14
      src/less/widget/multiselect/multiselect.insert.combo.less
  30. 14
      src/less/widget/multitree/multi.tree.combo.less
  31. 14
      src/less/widget/singleselect/multiselect.combo.less
  32. 2
      src/widget/downlist/combo.downlist.js
  33. 5
      src/widget/multiselect/multiselect.combo.js
  34. 5
      src/widget/multiselect/multiselect.insert.combo.js
  35. 5
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  36. 2
      src/widget/multitree/multi.tree.combo.js
  37. 5
      src/widget/singleselect/singleselect.combo.js

1
demo/js/widget/downlist/demo.downlist.js

@ -29,7 +29,6 @@ Demo.Downlist = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.downlist = _ref; self.downlist = _ref;
}, },
cls: "layout-bg3",
// value: [{"childValue":22,"value":11},{"value":18},{"value":20}], // value: [{"childValue":22,"value":11},{"value":18},{"value":20}],
height: 30, height: 30,
width: 100, width: 100,

48
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

24
dist/base.css vendored

@ -305,6 +305,18 @@
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button { .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949; color: #ff4949;
} }
.bi-search-text-value-combo .trigger-up {
display: none;
}
.bi-search-text-value-combo .trigger-down {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-up {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label { .bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
color: #ff4949; color: #ff4949;
@ -2402,6 +2414,18 @@ ul.ztree.zTreeDragUL {
.bi-trigger .bi-trigger-icon-button { .bi-trigger .bi-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-trigger .trigger-up {
display: none;
}
.bi-trigger .trigger-down {
display: block;
}
.bi-combo-popup .trigger-up {
display: block;
}
.bi-combo-popup .trigger-down {
display: none;
}
.bi-select-text-trigger { .bi-select-text-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;

1
dist/base.js vendored

@ -16693,6 +16693,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button", baseCls: (conf.baseCls || "") + " bi-button",
minWidth: (props.block === true || props.clear === true) ? 0 : 80, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,
isShadowShowingOnSelected: true, isShadowShowingOnSelected: true,
readonly: true, readonly: true,

72
dist/bundle.css vendored

@ -2351,6 +2351,18 @@ textarea {
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button { .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949; color: #ff4949;
} }
.bi-search-text-value-combo .trigger-up {
display: none;
}
.bi-search-text-value-combo .trigger-down {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-up {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label { .bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
color: #ff4949; color: #ff4949;
@ -4448,6 +4460,18 @@ ul.ztree.zTreeDragUL {
.bi-trigger .bi-trigger-icon-button { .bi-trigger .bi-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-trigger .trigger-up {
display: none;
}
.bi-trigger .trigger-down {
display: block;
}
.bi-combo-popup .trigger-up {
display: block;
}
.bi-combo-popup .trigger-down {
display: none;
}
.bi-select-text-trigger { .bi-select-text-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
@ -4753,10 +4777,34 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-combo .multi-select-trigger-icon-button { .bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-select-combo .trigger-up {
display: none;
}
.bi-multi-select-combo .trigger-down {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button { .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-select-insert-combo .trigger-up {
display: none;
}
.bi-multi-select-insert-combo .trigger-down {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-trigger { .bi-multi-select-trigger {
@ -4793,6 +4841,18 @@ ul.ztree.zTreeDragUL {
.bi-multi-tree-combo .multi-select-trigger-icon-button { .bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-tree-combo .trigger-up {
display: none;
}
.bi-multi-tree-combo .trigger-down {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-tree-combo .multi-select-trigger-icon-button { .bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
@ -5105,6 +5165,18 @@ ul.ztree.zTreeDragUL {
.bi-single-select-combo .single-select-trigger-icon-button { .bi-single-select-combo .single-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-single-select-combo .trigger-up {
display: none;
}
.bi-single-select-combo .trigger-down {
display: block;
}
.bi-single-select-combo.combo-show .trigger-up {
display: block;
}
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-single-slider-label { .bi-single-slider-label {
min-height: 50px; min-height: 50px;
} }

45
dist/bundle.js vendored

@ -52459,6 +52459,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button", baseCls: (conf.baseCls || "") + " bi-button",
minWidth: (props.block === true || props.clear === true) ? 0 : 80, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,
isShadowShowingOnSelected: true, isShadowShowingOnSelected: true,
readonly: true, readonly: true,
@ -72607,19 +72608,31 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
* Created by GUY on 2015/9/16. * Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton * @class BI.TriggerIconButton
* @extends BI.IconButton * @extends BI.IconButton
*
* attention: 不要加invisible, 不要单独拿出去用
*/ */
BI.TriggerIconButton = BI.inherit(BI.IconButton, { BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button", baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
extraCls: "pull-down-font"
}); });
}, },
_init: function () { _init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments); BI.TriggerIconButton.superclass._init.apply(this, arguments);
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [{
type: "bi.icon_button",
cls: "pull-down-font trigger-down"
}, {
type: "bi.icon_button",
cls: "pull-up-font trigger-up"
}]
});
}, },
doClick: function () { doClick: function () {
@ -78594,10 +78607,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () { action: function () {
self.trigger.stopEditing(); self.trigger.stopEditing();
self.element.removeClass("combo-show");
} }
}, { }, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
self.element.removeClass("combo-show").addClass("combo-show");
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
} }
}], }],
@ -89820,7 +89835,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
stopPropagation: o.stopPropagation, stopPropagation: o.stopPropagation,
el: BI.createWidget(o.el, { el: BI.createWidget(o.el, {
type: "bi.icon_trigger", type: "bi.icon_trigger",
extraCls: o.iconCls ? o.iconCls : "pull-down-font", extraCls: o.iconCls ? o.iconCls : "",
width: o.width, width: o.width,
height: o.height height: o.height
}), }),
@ -97657,7 +97672,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -98039,7 +98059,12 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -98409,7 +98434,12 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -101480,6 +101510,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
if (isSearching()) { if (isSearching()) {
return; return;
} }
@ -101492,6 +101523,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
if (isSearching()) { if (isSearching()) {
self.trigger.stopEditing(); self.trigger.stopEditing();
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@ -105273,7 +105305,12 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
value: o.value value: o.value
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

48
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

20
dist/case.js vendored

@ -117,19 +117,31 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
* Created by GUY on 2015/9/16. * Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton * @class BI.TriggerIconButton
* @extends BI.IconButton * @extends BI.IconButton
*
* attention: 不要加invisible, 不要单独拿出去用
*/ */
BI.TriggerIconButton = BI.inherit(BI.IconButton, { BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button", baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
extraCls: "pull-down-font"
}); });
}, },
_init: function () { _init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments); BI.TriggerIconButton.superclass._init.apply(this, arguments);
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [{
type: "bi.icon_button",
cls: "pull-down-font trigger-down"
}, {
type: "bi.icon_button",
cls: "pull-up-font trigger-up"
}]
});
}, },
doClick: function () { doClick: function () {
@ -6104,10 +6116,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () { action: function () {
self.trigger.stopEditing(); self.trigger.stopEditing();
self.element.removeClass("combo-show");
} }
}, { }, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
self.element.removeClass("combo-show").addClass("combo-show");
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
} }
}], }],

106
dist/demo.js vendored

@ -11019,111 +11019,6 @@ BI.shortcut("demo.tmp", Demo.Func);
}); });
BI.shortcut("demo.fix_global_watcher", Demo.Fix); BI.shortcut("demo.fix_global_watcher", Demo.Fix);
}());(function () {
var State = BI.inherit(Fix.Model, {
state: function () {
return {
name: "原始属性",
info: {
age: 12,
sex: "male",
birth: {
year: 2018,
month: 9,
day: 11
}
},
career: [{
a: 1,
b: 2,
c: 3
}]
};
},
computed: {
b: function () {
return this.model.name + "-计算属性";
},
birth: function () {
return this.model.info.birth;
}
}
});
Demo.Fix = BI.inherit(BI.Widget, {
_store: function () {
return new State();
},
watch: {
b: function () {
this.button.setText(this.model.b);
},
"birth.**": function () {
console.log(123);
}
},
render: function () {
var self = this;
return {
type: "bi.vertical",
items: [{
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.name = "这是改变后的属性";
},
text: this.model.b
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.birth.year = 2019;
},
text: "birthYearButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career.push({
year: 2017,
month: 3,
day: 24
});
},
text: "careerAddButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career[0].a = 24;
},
text: "careerChangeButton"
}
}]
};
},
mounted: function () {
}
});
BI.shortcut("demo.fix_immutable", Demo.Fix);
}());/** }());/**
* @Author: Young * @Author: Young
* @CreationDate 2017-11-06 10:32 * @CreationDate 2017-11-06 10:32
@ -12509,7 +12404,6 @@ BI.shortcut("demo.date_time", Demo.CustomDateTime);Demo.Downlist = BI.inherit(BI
ref: function (_ref) { ref: function (_ref) {
self.downlist = _ref; self.downlist = _ref;
}, },
cls: "layout-bg3",
// value: [{"childValue":22,"value":11},{"value":18},{"value":20}], // value: [{"childValue":22,"value":11},{"value":18},{"value":20}],
height: 30, height: 30,
width: 100, width: 100,

72
dist/fineui.css vendored

@ -2351,6 +2351,18 @@ textarea {
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button { .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949; color: #ff4949;
} }
.bi-search-text-value-combo .trigger-up {
display: none;
}
.bi-search-text-value-combo .trigger-down {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-up {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label { .bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
color: #ff4949; color: #ff4949;
@ -4448,6 +4460,18 @@ ul.ztree.zTreeDragUL {
.bi-trigger .bi-trigger-icon-button { .bi-trigger .bi-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-trigger .trigger-up {
display: none;
}
.bi-trigger .trigger-down {
display: block;
}
.bi-combo-popup .trigger-up {
display: block;
}
.bi-combo-popup .trigger-down {
display: none;
}
.bi-select-text-trigger { .bi-select-text-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
@ -4753,10 +4777,34 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-combo .multi-select-trigger-icon-button { .bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-select-combo .trigger-up {
display: none;
}
.bi-multi-select-combo .trigger-down {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button { .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-select-insert-combo .trigger-up {
display: none;
}
.bi-multi-select-insert-combo .trigger-down {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-trigger { .bi-multi-select-trigger {
@ -4793,6 +4841,18 @@ ul.ztree.zTreeDragUL {
.bi-multi-tree-combo .multi-select-trigger-icon-button { .bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-tree-combo .trigger-up {
display: none;
}
.bi-multi-tree-combo .trigger-down {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-tree-combo .multi-select-trigger-icon-button { .bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
@ -5105,6 +5165,18 @@ ul.ztree.zTreeDragUL {
.bi-single-select-combo .single-select-trigger-icon-button { .bi-single-select-combo .single-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-single-select-combo .trigger-up {
display: none;
}
.bi-single-select-combo .trigger-down {
display: block;
}
.bi-single-select-combo.combo-show .trigger-up {
display: block;
}
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-single-slider-label { .bi-single-slider-label {
min-height: 50px; min-height: 50px;
} }

45
dist/fineui.js vendored

@ -52702,6 +52702,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button", baseCls: (conf.baseCls || "") + " bi-button",
minWidth: (props.block === true || props.clear === true) ? 0 : 80, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,
isShadowShowingOnSelected: true, isShadowShowingOnSelected: true,
readonly: true, readonly: true,
@ -72850,19 +72851,31 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
* Created by GUY on 2015/9/16. * Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton * @class BI.TriggerIconButton
* @extends BI.IconButton * @extends BI.IconButton
*
* attention: 不要加invisible, 不要单独拿出去用
*/ */
BI.TriggerIconButton = BI.inherit(BI.IconButton, { BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button", baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
extraCls: "pull-down-font"
}); });
}, },
_init: function () { _init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments); BI.TriggerIconButton.superclass._init.apply(this, arguments);
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [{
type: "bi.icon_button",
cls: "pull-down-font trigger-down"
}, {
type: "bi.icon_button",
cls: "pull-up-font trigger-up"
}]
});
}, },
doClick: function () { doClick: function () {
@ -78837,10 +78850,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () { action: function () {
self.trigger.stopEditing(); self.trigger.stopEditing();
self.element.removeClass("combo-show");
} }
}, { }, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
self.element.removeClass("combo-show").addClass("combo-show");
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
} }
}], }],
@ -90063,7 +90078,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
stopPropagation: o.stopPropagation, stopPropagation: o.stopPropagation,
el: BI.createWidget(o.el, { el: BI.createWidget(o.el, {
type: "bi.icon_trigger", type: "bi.icon_trigger",
extraCls: o.iconCls ? o.iconCls : "pull-down-font", extraCls: o.iconCls ? o.iconCls : "",
width: o.width, width: o.width,
height: o.height height: o.height
}), }),
@ -97900,7 +97915,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -98282,7 +98302,12 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -98652,7 +98677,12 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -101723,6 +101753,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
if (isSearching()) { if (isSearching()) {
return; return;
} }
@ -101735,6 +101766,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
if (isSearching()) { if (isSearching()) {
self.trigger.stopEditing(); self.trigger.stopEditing();
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@ -105516,7 +105548,12 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
value: o.value value: o.value
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

48
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

48
dist/widget.css vendored

@ -248,10 +248,34 @@
.bi-multi-select-combo .multi-select-trigger-icon-button { .bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-select-combo .trigger-up {
display: none;
}
.bi-multi-select-combo .trigger-down {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button { .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-select-insert-combo .trigger-up {
display: none;
}
.bi-multi-select-insert-combo .trigger-down {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-trigger { .bi-multi-select-trigger {
@ -288,6 +312,18 @@
.bi-multi-tree-combo .multi-select-trigger-icon-button { .bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-tree-combo .trigger-up {
display: none;
}
.bi-multi-tree-combo .trigger-down {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-tree-combo .multi-select-trigger-icon-button { .bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
@ -600,6 +636,18 @@
.bi-single-select-combo .single-select-trigger-icon-button { .bi-single-select-combo .single-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-single-select-combo .trigger-up {
display: none;
}
.bi-single-select-combo .trigger-down {
display: block;
}
.bi-single-select-combo.combo-show .trigger-up {
display: block;
}
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-single-slider-label { .bi-single-slider-label {
min-height: 50px; min-height: 50px;
} }

24
dist/widget.js vendored

@ -2186,7 +2186,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
stopPropagation: o.stopPropagation, stopPropagation: o.stopPropagation,
el: BI.createWidget(o.el, { el: BI.createWidget(o.el, {
type: "bi.icon_trigger", type: "bi.icon_trigger",
extraCls: o.iconCls ? o.iconCls : "pull-down-font", extraCls: o.iconCls ? o.iconCls : "",
width: o.width, width: o.width,
height: o.height height: o.height
}), }),
@ -10023,7 +10023,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -10405,7 +10410,12 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -10775,7 +10785,12 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -13846,6 +13861,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
if (isSearching()) { if (isSearching()) {
return; return;
} }
@ -13858,6 +13874,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
if (isSearching()) { if (isSearching()) {
self.trigger.stopEditing(); self.trigger.stopEditing();
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@ -17639,7 +17656,12 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
value: o.value value: o.value
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();

1
src/base/single/button/buttons/button.js

@ -15,6 +15,7 @@
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button", baseCls: (conf.baseCls || "") + " bi-button",
minWidth: (props.block === true || props.clear === true) ? 0 : 80, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,
isShadowShowingOnSelected: true, isShadowShowingOnSelected: true,
readonly: true, readonly: true,

18
src/case/button/icon/icon.trigger.js

@ -4,19 +4,31 @@
* Created by GUY on 2015/9/16. * Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton * @class BI.TriggerIconButton
* @extends BI.IconButton * @extends BI.IconButton
*
* attention: 不要加invisible, 不要单独拿出去用
*/ */
BI.TriggerIconButton = BI.inherit(BI.IconButton, { BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button", baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
extraCls: "pull-down-font"
}); });
}, },
_init: function () { _init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments); BI.TriggerIconButton.superclass._init.apply(this, arguments);
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [{
type: "bi.icon_button",
cls: "pull-down-font trigger-down"
}, {
type: "bi.icon_button",
cls: "pull-up-font trigger-up"
}]
});
}, },
doClick: function () { doClick: function () {

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

@ -69,10 +69,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () { action: function () {
self.trigger.stopEditing(); self.trigger.stopEditing();
self.element.removeClass("combo-show");
} }
}, { }, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
self.element.removeClass("combo-show").addClass("combo-show");
self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
} }
}], }],

12
src/css/base/combo/combo.css

@ -118,6 +118,18 @@
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button { .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
color: #ff4949; color: #ff4949;
} }
.bi-search-text-value-combo .trigger-up {
display: none;
}
.bi-search-text-value-combo .trigger-down {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-up {
display: block;
}
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label { .bi-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
color: #ff4949; color: #ff4949;

12
src/css/base/trigger/trigger.css

@ -3,6 +3,18 @@
.bi-trigger .bi-trigger-icon-button { .bi-trigger .bi-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-trigger .trigger-up {
display: none;
}
.bi-trigger .trigger-down {
display: block;
}
.bi-combo-popup .trigger-up {
display: block;
}
.bi-combo-popup .trigger-down {
display: none;
}
.bi-select-text-trigger { .bi-select-text-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;

24
src/css/widget/multiselect/multiselect.css

@ -1,10 +1,34 @@
.bi-multi-select-combo .multi-select-trigger-icon-button { .bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-select-combo .trigger-up {
display: none;
}
.bi-multi-select-combo .trigger-down {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button { .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-select-insert-combo .trigger-up {
display: none;
}
.bi-multi-select-insert-combo .trigger-down {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-select-insert-combo.combo-show .trigger-down {
display: none;
}
.bi-multi-select-trigger { .bi-multi-select-trigger {

12
src/css/widget/multitree/multi.css

@ -1,3 +1,15 @@
.bi-multi-tree-combo .multi-select-trigger-icon-button { .bi-multi-tree-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-multi-tree-combo .trigger-up {
display: none;
}
.bi-multi-tree-combo .trigger-down {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-up {
display: block;
}
.bi-multi-tree-combo.combo-show .trigger-down {
display: none;
}

12
src/css/widget/singleselect/multiselect.css

@ -1,3 +1,15 @@
.bi-single-select-combo .single-select-trigger-icon-button { .bi-single-select-combo .single-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-single-select-combo .trigger-up {
display: none;
}
.bi-single-select-combo .trigger-down {
display: block;
}
.bi-single-select-combo.combo-show .trigger-up {
display: block;
}
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}

14
src/less/base/combo/combo.searchtextvalue.less

@ -11,4 +11,18 @@
} }
} }
} }
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
} }

15
src/less/base/trigger/trigger.less

@ -4,4 +4,19 @@
& .bi-trigger-icon-button{ & .bi-trigger-icon-button{
font-size: @font-size-16; font-size: @font-size-16;
} }
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
}
.bi-combo-popup {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
} }

5
src/less/widget/downlist/combo.downlist.less

@ -1,8 +1,5 @@
@import "../../index"; @import "../../index";
.bi-down-list-combo { .bi-down-list-combo {
& .down-list-group {
}
& .bi-down-list-spliter {
}
} }

14
src/less/widget/multiselect/multiselect.combo.less

@ -4,4 +4,18 @@
& .multi-select-trigger-icon-button{ & .multi-select-trigger-icon-button{
font-size: 16px; font-size: 16px;
} }
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
} }

14
src/less/widget/multiselect/multiselect.insert.combo.less

@ -4,4 +4,18 @@
& .multi-select-trigger-icon-button{ & .multi-select-trigger-icon-button{
font-size: 16px; font-size: 16px;
} }
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
} }

14
src/less/widget/multitree/multi.tree.combo.less

@ -4,4 +4,18 @@
& .multi-select-trigger-icon-button{ & .multi-select-trigger-icon-button{
font-size: 16px; font-size: 16px;
} }
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
} }

14
src/less/widget/singleselect/multiselect.combo.less

@ -4,4 +4,18 @@
& .single-select-trigger-icon-button{ & .single-select-trigger-icon-button{
font-size: 16px; font-size: 16px;
} }
& .trigger-up {
display: none;
}
& .trigger-down {
display: block;
}
&.combo-show {
& .trigger-up {
display: block;
}
& .trigger-down {
display: none;
}
}
} }

2
src/widget/downlist/combo.downlist.js

@ -48,7 +48,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
stopPropagation: o.stopPropagation, stopPropagation: o.stopPropagation,
el: BI.createWidget(o.el, { el: BI.createWidget(o.el, {
type: "bi.icon_trigger", type: "bi.icon_trigger",
extraCls: o.iconCls ? o.iconCls : "pull-down-font", extraCls: o.iconCls ? o.iconCls : "",
width: o.width, width: o.width,
height: o.height height: o.height
}), }),

5
src/widget/multiselect/multiselect.combo.js

@ -163,7 +163,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();

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

@ -164,7 +164,12 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();

5
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -176,7 +176,12 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();

2
src/widget/multitree/multi.tree.combo.js

@ -180,6 +180,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
if (isSearching()) { if (isSearching()) {
return; return;
} }
@ -192,6 +193,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
if (isSearching()) { if (isSearching()) {
self.trigger.stopEditing(); self.trigger.stopEditing();
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);

5
src/widget/singleselect/singleselect.combo.js

@ -134,7 +134,12 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
value: o.value value: o.value
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
self.element.removeClass("combo-show");
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.element.removeClass("combo-show").addClass("combo-show");
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();

Loading…
Cancel
Save