Browse Source

Merge pull request #1205 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'ea7bc9fc5a32f93525c22d2f0a08c2c33743d0c5':
  revert: test
  revert: fn
  REPORT-24923 && REPORT-24867 fix: 日期控件下拉收起
  update
  BI-56945 hidden danger: 啊a标红值标红了一个 && 单测
es6
windy 5 years ago
parent
commit
1fa0159293
  1. 1
      src/widget/dynamicdate/dynamicdate.combo.js
  2. 4
      src/widget/dynamicdate/dynamicdate.popup.js
  3. 1
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  4. 4
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  5. 4
      src/widget/yearmonth/card.static.yearmonth.js
  6. 4
      src/widget/yearmonth/popup.yearmonth.js

1
src/widget/dynamicdate/dynamicdate.combo.js

@ -46,6 +46,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
toggle: false, toggle: false,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
destroyWhenHide: true,
el: { el: {
type: "bi.dynamic_date_trigger", type: "bi.dynamic_date_trigger",
min: opts.minDate, min: opts.minDate,

4
src/widget/dynamicdate/dynamicdate.popup.js

@ -173,16 +173,16 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
setMinDate: function (minDate) { setMinDate: function (minDate) {
if (this.options.min !== minDate) { if (this.options.min !== minDate) {
this.options.min = minDate;
this.ymd.setMinDate(minDate); this.ymd.setMinDate(minDate);
} }
this.options.min = minDate;
}, },
setMaxDate: function (maxDate) { setMaxDate: function (maxDate) {
if (this.options.max !== maxDate) { if (this.options.max !== maxDate) {
this.options.max = maxDate;
this.ymd.setMaxDate(maxDate); this.ymd.setMaxDate(maxDate);
} }
this.options.max = maxDate;
}, },
setValue: function (v) { setValue: function (v) {

1
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -39,6 +39,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
destroyWhenHide: true,
container: opts.container, container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;

4
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -180,16 +180,16 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
setMinDate: function (minDate) { setMinDate: function (minDate) {
if (this.options.min !== minDate) { if (this.options.min !== minDate) {
this.options.min = minDate;
this.ymd.setMinDate(minDate); this.ymd.setMinDate(minDate);
} }
this.options.min = minDate;
}, },
setMaxDate: function (maxDate) { setMaxDate: function (maxDate) {
if (this.options.max !== maxDate) { if (this.options.max !== maxDate) {
this.options.max = maxDate;
this.ymd.setMaxDate(maxDate); this.ymd.setMaxDate(maxDate);
} }
this.options.max = maxDate;
}, },
setValue: function (v) { setValue: function (v) {

4
src/widget/yearmonth/card.static.yearmonth.js

@ -115,18 +115,18 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
setMinDate: function (minDate) { setMinDate: function (minDate) {
if (this.options.min !== minDate) { if (this.options.min !== minDate) {
this.options.min = minDate;
this.yearPicker.setMinDate(minDate); this.yearPicker.setMinDate(minDate);
this._checkMonthStatus(this.selectedYear); this._checkMonthStatus(this.selectedYear);
} }
this.options.min = minDate;
}, },
setMaxDate: function (maxDate) { setMaxDate: function (maxDate) {
if (this.options.max !== maxDate) { if (this.options.max !== maxDate) {
this.options.max = maxDate;
this.yearPicker.setMaxDate(maxDate); this.yearPicker.setMaxDate(maxDate);
this._checkMonthStatus(this.selectedYear); this._checkMonthStatus(this.selectedYear);
} }
this.options.max = maxDate;
}, },
getValue: function () { getValue: function () {

4
src/widget/yearmonth/popup.yearmonth.js

@ -172,16 +172,16 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
setMinDate: function (minDate) { setMinDate: function (minDate) {
if (this.options.min !== minDate) { if (this.options.min !== minDate) {
this.options.min = minDate;
this.year.setMinDate(minDate); this.year.setMinDate(minDate);
} }
this.options.min = minDate;
}, },
setMaxDate: function (maxDate) { setMaxDate: function (maxDate) {
if (this.options.max !== maxDate) { if (this.options.max !== maxDate) {
this.options.max = maxDate;
this.year.setMaxDate(maxDate); this.year.setMaxDate(maxDate);
} }
this.options.max = maxDate;
}, },
setValue: function (v) { setValue: function (v) {

Loading…
Cancel
Save