Browse Source

Pull request #2068: 无jira任务,年月区间支持高度调整、MultiSelectLoader中全选高度调整

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

* commit '7c4eb6174c0e5a6cf21a92877d63bd99011188f1':
  无jira任务,MultiSelectLoader中全选高度调整
  无jira任务,年月区间支持高度调整
es6
Guyi 3 years ago
parent
commit
646829159a
  1. 1
      src/widget/multiselect/multiselect.loader.js
  2. 7
      src/widget/yearmonthinterval/yearmonthinterval.js

1
src/widget/multiselect/multiselect.loader.js

@ -37,6 +37,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
toolbar: { toolbar: {
type: "bi.multi_select_bar", type: "bi.multi_select_bar",
cls: "bi-list-item-active", cls: "bi-list-item-active",
height: this.options.itemHeight || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconWrapperWidth: 36 iconWrapperWidth: 36
}, },
el: BI.extend({ el: BI.extend({

7
src/widget/yearmonthinterval/yearmonthinterval.js

@ -1,6 +1,5 @@
BI.YearMonthInterval = BI.inherit(BI.Single, { BI.YearMonthInterval = BI.inherit(BI.Single, {
constants: { constants: {
height: 24,
width: 25, width: 25,
lgap: 15, lgap: 15,
offset: -15, offset: -15,
@ -12,6 +11,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
minDate: "1900-01-01", minDate: "1900-01-01",
maxDate: "2099-12-31", maxDate: "2099-12-31",
supportDynamic: true, supportDynamic: true,
height: 24
}, },
_init: function () { _init: function () {
@ -23,7 +23,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
this.right = this._createCombo(o.value.end); this.right = this._createCombo(o.value.end);
this.label = BI.createWidget({ this.label = BI.createWidget({
type: "bi.label", type: "bi.label",
height: this.constants.height, height: o.height,
width: this.constants.width, width: this.constants.width,
text: "-" text: "-"
}); });
@ -31,7 +31,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
element: self, element: self,
type: "bi.center", type: "bi.center",
hgap: 15, hgap: 15,
height: this.constants.height, height: o.height,
items: [{ items: [{
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
@ -66,6 +66,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_year_month_combo", type: "bi.dynamic_year_month_combo",
supportDynamic: o.supportDynamic, supportDynamic: o.supportDynamic,
height: o.height,
minDate: o.minDate, minDate: o.minDate,
maxDate: o.maxDate, maxDate: o.maxDate,
behaviors: o.behaviors, behaviors: o.behaviors,

Loading…
Cancel
Save