Browse Source

Pull request #1848: BI-83716 fix: 动态时间面板的时间预览不受范围限制

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '3518b158629cc7ed4b3307f6461ded1d9d6fbf02':
  BI-83716 fix: 动态时间面板的时间预览不受范围限制
es6
windy 4 years ago
parent
commit
80e6c5b028
  1. 4
      src/widget/dynamicdate/dynamicdate.card.js
  2. 2
      src/widget/dynamicdate/dynamicdate.popup.js
  3. 2
      src/widget/dynamicdatetime/dynamicdatetime.popup.js

4
src/widget/dynamicdate/dynamicdate.card.js

@ -389,6 +389,10 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
return this.checkValidation() ? this._getValue() : {}; return this.checkValidation() ? this._getValue() : {};
}, },
getInputValue: function () {
return this._getValue();
},
checkValidation: function (show) { checkValidation: function (show) {
var buttons = this.resultPane.getAllButtons(); var buttons = this.resultPane.getAllButtons();
var errorText; var errorText;

2
src/widget/dynamicdate/dynamicdate.popup.js

@ -178,7 +178,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today")); this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today"));
this.todayButton.setEnable(!this._checkTodayValid()); this.todayButton.setEnable(!this._checkTodayValid());
} else { } else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue()); var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getInputValue());
date = BI.print(date, "%Y-%X-%d"); date = BI.print(date, "%Y-%X-%d");
this.todayButton.setValue(date); this.todayButton.setValue(date);
this.todayButton.setEnable(false); this.todayButton.setEnable(false);

2
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -181,7 +181,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today")); this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today"));
this.todayButton.setEnable(!this._checkTodayValid()); this.todayButton.setEnable(!this._checkTodayValid());
} else { } else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue()); var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getInputValue());
date = BI.print(date, "%Y-%X-%d"); date = BI.print(date, "%Y-%X-%d");
this.todayButton.setValue(date); this.todayButton.setValue(date);
this.todayButton.setEnable(false); this.todayButton.setEnable(false);

Loading…
Cancel
Save