Browse Source

Pull request #1518: BI-73636 fix:年季度控件“季度”显示不全

Merge in VISUAL/fineui from ~JIMMY.CHAI/fineui:master to master

* commit '35fe068d4cfe9139616aea6767de18195798f8ad':
  BI-73636 fix:年季度控件“季度”显示不全
  BI-73636 fix:年季度控件“季度”显示不全
es6
Jimmy.Chai 4 years ago
parent
commit
976c869e0e
  1. 16
      src/widget/yearquarter/trigger.yearquarter.js

16
src/widget/yearquarter/trigger.yearquarter.js

@ -18,6 +18,9 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
this.yearEditor = this._createEditor(true); this.yearEditor = this._createEditor(true);
this.quarterEditor = this._createEditor(false); this.quarterEditor = this._createEditor(false);
// 暂时的解决方法
var height = o.height + 2;
BI.createWidget({ BI.createWidget({
element: this, element: this,
type: "bi.htape", type: "bi.htape",
@ -29,9 +32,9 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
el: { el: {
type: "bi.text_button", type: "bi.text_button",
text: BI.i18nText("BI-Multi_Date_Year"), text: BI.i18nText("BI-Multi_Date_Year"),
width: o.height width: height
}, },
width: o.height width: height
}] }]
}, { }, {
type: "bi.htape", type: "bi.htape",
@ -39,16 +42,17 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
el: { el: {
type: "bi.text_button", type: "bi.text_button",
text: BI.i18nText("BI-Multi_Date_Quarter"), text: BI.i18nText("BI-Multi_Date_Quarter"),
width: o.height width: height
}, },
width: o.height}] width: height
}]
}] }]
}, { }, {
el: { el: {
type: "bi.trigger_icon_button", type: "bi.trigger_icon_button",
width: o.height width: height
}, },
width: o.height width: height
}] }]
}); });
this.setValue(o.value); this.setValue(o.value);

Loading…
Cancel
Save