Browse Source

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

* commit '4fd5faa8d95aba92d5ee2fc53061b19e986eb5ef':
  REPORT-77246 fix: 根据review建议修改代码
  REPORT-77246 fix: 修复bi.time_combo组件内容和图标重叠的问题
master
superman 2 years ago
parent
commit
c47f798dbf
  1. 19
      src/widget/time/time.combo.js

19
src/widget/time/time.combo.js

@ -60,13 +60,14 @@
} }
}; };
return { return {
type: "bi.htape", type: "bi.horizontal_fill",
items: [{ cls: "bi-border bi-border-radius",
type: "bi.absolute", columnSize: ["fill", this.constants.iconWidth],
height: opts.height - 2,
width: opts.width - 2,
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
cls: "bi-border bi-border-radius",
container: opts.container, container: opts.container,
toggle: false, toggle: false,
isNeedAdjustHeight: opts.isNeedAdjustHeight, isNeedAdjustHeight: opts.isNeedAdjustHeight,
@ -170,16 +171,11 @@
self.combo = _ref; self.combo = _ref;
} }
}, },
top: 0,
left: 0,
right: 0,
bottom: 0
}, { }, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button time-font icon-size-16", cls: "bi-trigger-icon-button time-font",
width: this.constants.iconWidth, width: this.constants.iconWidth,
height: opts.height,
listeners: [{ listeners: [{
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
@ -194,9 +190,6 @@
self.triggerBtn = _ref; self.triggerBtn = _ref;
} }
}, },
top: 0,
right: 0
}]
}] }]
}; };
}, },

Loading…
Cancel
Save