Browse Source

Pull request #3026: 无JIRA fix: nor_bar 复选下拉框切换箭头

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '820df8c8a42d2183663b0c98d3bb87a99f49d722':
  KERNEL-11626 feat: 半选checkbox支持动态宽高
  无JIRA fix: nor_bar 复选下拉框切换箭头
es6
Dailer 2 years ago
parent
commit
6dc2a501eb
  1. 24
      src/case/button/icon/iconhalf/icon.half.js
  2. 8
      src/less/widget/multiselect/multiselect.combo.less
  3. 22
      src/widget/multiselect/multiselect.combo.nobar.js

24
src/case/button/icon/iconhalf/icon.half.js

@ -7,20 +7,34 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
extraCls: "bi-half-button bi-high-light-border",
height: 14,
selected: false,
width: 14,
selected: false
height: 14,
iconWidth: 14,
iconHeight: 14,
});
},
render: function () {
var o = this.options;
return {
type: "bi.center_adapt",
items: [{
type: "bi.default",
cls: "bi-half-button bi-high-light-border",
width: o.iconWidth,
height: o.iconHeight,
}],
};
},
doClick: function () {
BI.HalfButton.superclass.doClick.apply(this, arguments);
if(this.isValid()) {
if (this.isValid()) {
this.fireEvent(BI.HalfButton.EVENT_CHANGE);
}
}
});
BI.HalfButton.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.half_button", BI.HalfButton);
BI.shortcut("bi.half_button", BI.HalfButton);

8
src/less/widget/multiselect/multiselect.combo.less

@ -1,9 +1,12 @@
@import "../../index.less";
@val: transform .3s ease;
.bi-multi-select-combo{
& .multi-select-trigger-icon-button{
.bi-multi-select-combo, .bi-multi-select-combo-no-bar {
& .multi-select-trigger-icon-button {
font-size: @font-size-16;
}
// 此combo的trigger_button是absolute上去的,与bi-combo在同一层级,独立写一下
& .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
& .x-icon {
@ -11,6 +14,7 @@
.transition(@val);
}
}
& .bi-combo + .bi-trigger-icon-button {
& .x-icon {
.rotate(0deg);

22
src/widget/multiselect/multiselect.combo.nobar.js

@ -174,7 +174,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
value: o.value
},
hideChecker: function (e) {
return self.numberCounter.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && self.numberCounter.element.find(e.target).length === 0;
}
});
@ -199,6 +199,21 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
}
});
var triggerBtn = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.height,
height: o.height,
cls: "multi-select-trigger-icon-button"
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
self.numberCounter.hideView();
if (self.combo.isViewVisible()) {
self.combo.hideView();
} else {
self.combo.showView();
}
});
this.numberCounter = BI.createWidget({
type: "bi.multi_select_check_selected_switcher",
masker: {
@ -252,6 +267,11 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
right: 0,
top: 0,
bottom: 0
}, {
el: triggerBtn,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.vertical_adapt",

Loading…
Cancel
Save