Browse Source

Pull request #1850: BI-83687 fix: 动态时间面板提示位置修改

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

* commit '274b0ffe09e46c0446a095e65dba1b0fab606bfe':
  BI-83687 fix: 动态时间面板提示位置修改
es6
windy 4 years ago
parent
commit
cc5dbfb6fc
  1. 6
      src/widget/year/card.dynamic.year.js
  2. 2
      src/widget/year/popup.year.js
  3. 76
      src/widget/yearmonth/card.dynamic.yearmonth.js
  4. 2
      src/widget/yearmonth/popup.yearmonth.js
  5. 76
      src/widget/yearquarter/card.dynamic.yearquarter.js
  6. 2
      src/widget/yearquarter/popup.yearquarter.js

6
src/widget/year/card.dynamic.year.js

@ -93,6 +93,10 @@ BI.DynamicYearCard = BI.inherit(BI.Widget, {
};
},
getInputValue: function () {
return this._getValue();
},
getValue: function () {
return this.checkValidation() ? this._getValue() : {};
},
@ -106,7 +110,7 @@ BI.DynamicYearCard = BI.inherit(BI.Widget, {
invalid = !this._checkDate(this._getValue());
errorText = this._getErrorText();
}
invalid && show && BI.Bubbles.show("dynamic-year-error", errorText, this.wrapper);
invalid && show && BI.Bubbles.show("dynamic-year-error", errorText, this.item);
return !invalid;
},

2
src/widget/year/popup.year.js

@ -87,7 +87,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
this.yearButton.setValue(BI.i18nText("BI-Basic_Current_Year"));
this.yearButton.setEnable(!this._checkYearValid());
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getInputValue());
date = BI.print(date, "%Y");
this.yearButton.setValue(date);
this.yearButton.setEnable(false);

76
src/widget/yearmonth/card.dynamic.yearmonth.js

@ -15,47 +15,53 @@ BI.DynamicYearMonthCard = BI.inherit(BI.Widget, {
var self = this;
return {
type: "bi.vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
items: [{
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24
}, {
type: "bi.dynamic_date_param_item",
validationChecker: BI.bind(self._checkDate, self),
ref: function () {
self.year = this;
type: "bi.vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
self.fireEvent("EVENT_CHANGE");
}
items: [{
el: {
type: "bi.dynamic_date_param_item",
validationChecker: BI.bind(self._checkDate, self),
ref: function () {
self.year = this;
},
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
self.fireEvent("EVENT_CHANGE");
}
}, {
eventName: "EVENT_INPUT_CHANGE",
action: function () {
BI.Bubbles.hide("dynamic-year-month-error");
}
}]
},
bgap: 10,
}, {
eventName: "EVENT_INPUT_CHANGE",
action: function () {
BI.Bubbles.hide("dynamic-year-month-error");
}
}]
}, {
type: "bi.dynamic_date_param_item",
dateType: BI.DynamicDateCard.TYPE.MONTH,
ref: function () {
self.month = this;
},
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
self.fireEvent("EVENT_CHANGE");
}
}, {
eventName: "EVENT_INPUT_CHANGE",
action: function () {
BI.Bubbles.hide("dynamic-year-month-error");
}
type: "bi.dynamic_date_param_item",
dateType: BI.DynamicDateCard.TYPE.MONTH,
ref: function () {
self.month = this;
},
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
self.fireEvent("EVENT_CHANGE");
}
}, {
eventName: "EVENT_INPUT_CHANGE",
action: function () {
BI.Bubbles.hide("dynamic-year-month-error");
}
}]
}]
}],
vgap: 10,
@ -132,6 +138,10 @@ BI.DynamicYearMonthCard = BI.inherit(BI.Widget, {
};
},
getInputValue: function () {
return this._getValue();
},
getValue: function () {
return this.checkValidation() ? this._getValue() : {};
},

2
src/widget/yearmonth/popup.yearmonth.js

@ -87,7 +87,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
this.textButton.setValue(BI.i18nText("BI-Basic_Current_Month"));
this.textButton.setEnable(!this._checkTodayValid());
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getInputValue());
date = BI.print(date, "%Y-%x");
this.textButton.setValue(date);
this.textButton.setEnable(false);

76
src/widget/yearquarter/card.dynamic.yearquarter.js

@ -15,47 +15,53 @@ BI.DynamicYearQuarterCard = BI.inherit(BI.Widget, {
var self = this;
return {
type: "bi.vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
items: [{
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24
}, {
type: "bi.dynamic_date_param_item",
validationChecker: BI.bind(self._checkDate, self),
ref: function () {
self.year = this;
type: "bi.vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
self.fireEvent("EVENT_CHANGE");
}
items: [{
el: {
type: "bi.dynamic_date_param_item",
validationChecker: BI.bind(self._checkDate, self),
ref: function () {
self.year = this;
},
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
self.fireEvent("EVENT_CHANGE");
}
}, {
eventName: "EVENT_INPUT_CHANGE",
action: function () {
BI.Bubbles.hide("dynamic-year-quarter-error");
}
}]
},
bgap: 10
}, {
eventName: "EVENT_INPUT_CHANGE",
action: function () {
BI.Bubbles.hide("dynamic-year-quarter-error");
}
}]
}, {
type: "bi.dynamic_date_param_item",
dateType: BI.DynamicDateCard.TYPE.QUARTER,
ref: function () {
self.quarter = this;
},
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
self.fireEvent("EVENT_CHANGE");
}
}, {
eventName: "EVENT_INPUT_CHANGE",
action: function () {
BI.Bubbles.hide("dynamic-year-quarter-error");
}
type: "bi.dynamic_date_param_item",
dateType: BI.DynamicDateCard.TYPE.QUARTER,
ref: function () {
self.quarter = this;
},
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
self.fireEvent("EVENT_CHANGE");
}
}, {
eventName: "EVENT_INPUT_CHANGE",
action: function () {
BI.Bubbles.hide("dynamic-year-quarter-error");
}
}]
}]
}],
vgap: 10,
@ -132,6 +138,10 @@ BI.DynamicYearQuarterCard = BI.inherit(BI.Widget, {
};
},
getInputValue: function () {
return this._getValue();
},
getValue: function () {
return this.checkValidation() ? this._getValue() : {};
},

2
src/widget/yearquarter/popup.yearquarter.js

@ -80,7 +80,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
this.textButton.setValue(BI.i18nText("BI-Basic_Current_Quarter"));
this.textButton.setEnable(!this._checkTodayValid());
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getInputValue());
date = BI.print(date, "%Y-%Q");
this.textButton.setValue(date);
this.textButton.setEnable(false);

Loading…
Cancel
Save