Browse Source

Merge pull request #146075 in DEC/fineui from final/11.0 to release/11.0

* commit 'f1ef0ad48ea96ebf9f3e746d95513a682cd4f83a':
  REPORT-78579 fix: 调整bi.time_combo组件结构,保持结构统一
research/test
superman 2 years ago
parent
commit
f930b9a6f9
  1. 54
      src/widget/time/time.combo.js

54
src/widget/time/time.combo.js

@ -60,19 +60,20 @@
}
};
return {
type: "bi.horizontal_fill",
cls: "bi-border bi-border-radius",
columnSize: ["fill", this.constants.iconWidth],
height: opts.height - 2,
width: opts.width - 2,
type: "bi.absolute",
items: [{
el: {
type: "bi.combo",
cls: "bi-border bi-border-radius",
container: opts.container,
toggle: false,
isNeedAdjustHeight: opts.isNeedAdjustHeight,
isNeedAdjustWidth: opts.isNeedAdjustWidth,
el: {
type: "bi.horizontal_fill",
columnSize: ["fill", this.constants.iconWidth],
height: opts.height - 2,
items: [{
type: "bi.time_trigger",
height: opts.height - 2,
allowEdit: opts.allowEdit,
@ -150,6 +151,26 @@
self.fireEvent("EVENT_CONFIRM");
}
}]
}, {
el: {
type: "bi.icon_button",
cls: "bi-trigger-icon-button time-font",
width: this.constants.iconWidth,
listeners: [{
eventName: BI.IconButton.EVENT_CHANGE,
action: function () {
if (self.combo.isViewVisible()) {
// self.combo.hideView();
} else {
self.combo.showView();
}
}
}],
ref: function (_ref) {
self.triggerBtn = _ref;
}
},
}],
},
adjustLength: this.constants.comboAdjustHeight,
popup: {
@ -171,25 +192,10 @@
self.combo = _ref;
}
},
}, {
el: {
type: "bi.icon_button",
cls: "bi-trigger-icon-button time-font",
width: this.constants.iconWidth,
listeners: [{
eventName: BI.IconButton.EVENT_CHANGE,
action: function () {
if (self.combo.isViewVisible()) {
// self.combo.hideView();
} else {
self.combo.showView();
}
}
}],
ref: function (_ref) {
self.triggerBtn = _ref;
}
},
top: 0,
left: 0,
right: 0,
bottom: 0
}]
};
},

Loading…
Cancel
Save