Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

es6
windy 4 years ago
parent
319f1a3c04
commit
274b0ffe09
6 changed files with 94 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

@ -93,6 +93,10 @@ BI.DynamicYearCard = BI.inherit(BI.Widget, {
}; };
}, },
getInputValue: function () {
return this._getValue();
},
getValue: function () { getValue: function () {
return this.checkValidation() ? this._getValue() : {}; return this.checkValidation() ? this._getValue() : {};
}, },
@ -106,7 +110,7 @@ BI.DynamicYearCard = BI.inherit(BI.Widget, {
invalid = !this._checkDate(this._getValue()); invalid = !this._checkDate(this._getValue());
errorText = this._getErrorText(); 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; return !invalid;
}, },

2
src/widget/year/popup.year.js
Unescape View File

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

76
src/widget/yearmonth/card.dynamic.yearmonth.js
Unescape View File

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

2
src/widget/yearmonth/popup.yearmonth.js
Unescape View File

@ -87,7 +87,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
this.textButton.setValue(BI.i18nText("BI-Basic_Current_Month")); this.textButton.setValue(BI.i18nText("BI-Basic_Current_Month"));
this.textButton.setEnable(!this._checkTodayValid()); this.textButton.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"); date = BI.print(date, "%Y-%x");
this.textButton.setValue(date); this.textButton.setValue(date);
this.textButton.setEnable(false); this.textButton.setEnable(false);

76
src/widget/yearquarter/card.dynamic.yearquarter.js
Unescape View File

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

2
src/widget/yearquarter/popup.yearquarter.js
Unescape View File

@ -80,7 +80,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
this.textButton.setValue(BI.i18nText("BI-Basic_Current_Quarter")); this.textButton.setValue(BI.i18nText("BI-Basic_Current_Quarter"));
this.textButton.setEnable(!this._checkTodayValid()); this.textButton.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-%Q"); date = BI.print(date, "%Y-%Q");
this.textButton.setValue(date); this.textButton.setValue(date);
this.textButton.setEnable(false); this.textButton.setEnable(false);

Write Preview
Loading…
Cancel
Save