Browse Source

Merge pull request #207192 in DEC/fineui from master to feature/x

* commit 'd1a2d838ef86186fcb4d997ccb4902c06397cfe4':
  BI-117406 fix: 动态图标无
master
superman 2 years ago
parent
commit
52a9eb7635
  1. 2
      src/widget/year/combo.year.js
  2. 2
      src/widget/yearmonth/combo.yearmonth.js
  3. 4
      src/widget/yearquarter/combo.yearquarter.js

2
src/widget/year/combo.year.js

@ -141,7 +141,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button", cls: "bi-trigger-icon-button date-change-h-font",
width: this._const.iconWidth, width: this._const.iconWidth,
height: BI.toPix(o.height, border), height: BI.toPix(o.height, border),
ref: function () { ref: function () {

2
src/widget/yearmonth/combo.yearmonth.js

@ -141,7 +141,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button", cls: "bi-trigger-icon-button date-change-h-font",
width: BI.toPix(o.height, border), width: BI.toPix(o.height, border),
height: BI.toPix(o.height, border), height: BI.toPix(o.height, border),
ref: function () { ref: function () {

4
src/widget/yearquarter/combo.yearquarter.js

@ -144,7 +144,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button", cls: "bi-trigger-icon-button date-change-h-font",
width: this._consts.iconWidth, width: this._consts.iconWidth,
height: BI.toPix(o.height, border), height: BI.toPix(o.height, border),
ref: function () { ref: function () {
@ -169,7 +169,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
} }
switch (type) { switch (type) {
case BI.DynamicYearQuarterCombo.Dynamic: case BI.DynamicYearQuarterCombo.Dynamic:
this.comboWrapper.resize(); this.changeIcon.setVisible(true);
break; break;
default: default:
this.changeIcon.setVisible(false); this.changeIcon.setVisible(false);

Loading…
Cancel
Save