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

BI-20119

es6
windy 7 years ago
parent
81a64ef4f3
commit
912c5f1374
14 changed files with 138 additions and 154 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      demo/js/widget/date/demo.multidate_combo.js
  2. 26
      dist/_fineui.min.js
  3. 52
      dist/bundle.js
  4. 28
      dist/bundle.min.js
  5. 2
      dist/demo.js
  6. 52
      dist/fineui.js
  7. 26
      dist/fineui.min.js
  8. 52
      dist/widget.js
  9. 5
      src/widget/dynamicdate/dynamicdate.combo.js
  10. 5
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  11. 14
      src/widget/yearmonth/card.static.yearmonth.js
  12. 7
      src/widget/yearmonth/combo.yearmonth.js
  13. 14
      src/widget/yearquarter/card.static.yearquarter.js
  14. 7
      src/widget/yearquarter/combo.yearquarter.js

2
demo/js/widget/date/demo.multidate_combo.js
Unescape View File

@ -20,7 +20,7 @@ Demo.Date = BI.inherit(BI.Widget, {
ref: function () {
self.datecombo = this;
},
width: 300,
width: 300
// value: {
// type: 1,
// value: {

26
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

52
dist/bundle.js vendored
Unescape View File

@ -90877,10 +90877,7 @@ BI.extend(BI.DynamicDateCard, {
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
this._checkDynamicValue(this.storeValue);
},
_checkDynamicValue: function (v) {
@ -91740,10 +91737,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
this._checkDynamicValue(this.storeValue);
},
_checkDynamicValue: function (v) {
@ -109022,18 +109016,18 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
setValue: function (obj) {
var o = this.options;
obj = obj || {};
obj.year = obj.year || 0;
obj.month = obj.month || 0;
if (obj.year === 0 || obj.month === 0 || BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
var year = obj.year || BI.getDate().getFullYear();
var newObj = {};
newObj.year = obj.year || 0;
newObj.month = obj.month || 0;
if (newObj.year === 0 || newObj.month === 0 || BI.checkDateVoid(newObj.year, newObj.month, 1, o.min, o.max)[0]) {
var year = newObj.year || BI.getDate().getFullYear();
this.selectedYear = year;
this.selectedMonth = "";
this.yearPicker.setValue(year);
this.month.setValue();
} else {
this.selectedYear = BI.parseInt(obj.year);
this.selectedMonth = BI.parseInt(obj.month);
this.selectedYear = BI.parseInt(newObj.year);
this.selectedMonth = BI.parseInt(newObj.month);
this.yearPicker.setValue(this.selectedYear);
this.month.setValue(this.selectedMonth);
}
@ -109079,9 +109073,10 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.DynamicYearMonthCombo.EVENT_VALID);
});
this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_CONFIRM, function () {
if (self.combo.isViewVisible()) {
return;
}
// 没看出来干啥的，先去掉
// if (self.combo.isViewVisible()) {
// return;
// }
var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey();
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {
@ -110023,18 +110018,18 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
setValue: function (obj) {
var o = this.options;
obj = obj || {};
obj.year = obj.year || 0;
obj.quarter = obj.quarter || 0;
if (obj.quarter === 0 || obj.year === 0 || BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
var year = obj.year || BI.getDate().getFullYear();
var newObj = {};
newObj.year = obj.year || 0;
newObj.quarter = obj.quarter || 0;
if (newObj.quarter === 0 || newObj.year === 0 || BI.checkDateVoid(newObj.year, newObj.quarter, 1, o.min, o.max)[0]) {
var year = newObj.year || BI.getDate().getFullYear();
this.selectedYear = year;
this.selectedQuarter = "";
this.yearPicker.setValue(year);
this.quarter.setValue();
} else {
this.selectedYear = BI.parseInt(obj.year);
this.selectedQuarter = BI.parseInt(obj.quarter);
this.selectedYear = BI.parseInt(newObj.year);
this.selectedQuarter = BI.parseInt(newObj.quarter);
this.yearPicker.setValue(this.selectedYear);
this.quarter.setValue(this.selectedQuarter);
}
@ -110076,9 +110071,10 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
self.combo.isViewVisible() && self.combo.hideView();
});
this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM, function () {
if (self.combo.isViewVisible()) {
return;
}
// 没看出来干啥的，先去掉
// if (self.combo.isViewVisible()) {
// return;
// }
var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey();
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {

28
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.js vendored
Unescape View File

@ -12380,7 +12380,7 @@ Demo.Date = BI.inherit(BI.Widget, {
ref: function () {
self.datecombo = this;
},
width: 300,
width: 300
// value: {
// type: 1,
// value: {

52
dist/fineui.js vendored
Unescape View File

@ -91120,10 +91120,7 @@ BI.extend(BI.DynamicDateCard, {
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
this._checkDynamicValue(this.storeValue);
},
_checkDynamicValue: function (v) {
@ -91983,10 +91980,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
this._checkDynamicValue(this.storeValue);
},
_checkDynamicValue: function (v) {
@ -109265,18 +109259,18 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
setValue: function (obj) {
var o = this.options;
obj = obj || {};
obj.year = obj.year || 0;
obj.month = obj.month || 0;
if (obj.year === 0 || obj.month === 0 || BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
var year = obj.year || BI.getDate().getFullYear();
var newObj = {};
newObj.year = obj.year || 0;
newObj.month = obj.month || 0;
if (newObj.year === 0 || newObj.month === 0 || BI.checkDateVoid(newObj.year, newObj.month, 1, o.min, o.max)[0]) {
var year = newObj.year || BI.getDate().getFullYear();
this.selectedYear = year;
this.selectedMonth = "";
this.yearPicker.setValue(year);
this.month.setValue();
} else {
this.selectedYear = BI.parseInt(obj.year);
this.selectedMonth = BI.parseInt(obj.month);
this.selectedYear = BI.parseInt(newObj.year);
this.selectedMonth = BI.parseInt(newObj.month);
this.yearPicker.setValue(this.selectedYear);
this.month.setValue(this.selectedMonth);
}
@ -109322,9 +109316,10 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.DynamicYearMonthCombo.EVENT_VALID);
});
this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_CONFIRM, function () {
if (self.combo.isViewVisible()) {
return;
}
// 没看出来干啥的，先去掉
// if (self.combo.isViewVisible()) {
// return;
// }
var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey();
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {
@ -110266,18 +110261,18 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
setValue: function (obj) {
var o = this.options;
obj = obj || {};
obj.year = obj.year || 0;
obj.quarter = obj.quarter || 0;
if (obj.quarter === 0 || obj.year === 0 || BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
var year = obj.year || BI.getDate().getFullYear();
var newObj = {};
newObj.year = obj.year || 0;
newObj.quarter = obj.quarter || 0;
if (newObj.quarter === 0 || newObj.year === 0 || BI.checkDateVoid(newObj.year, newObj.quarter, 1, o.min, o.max)[0]) {
var year = newObj.year || BI.getDate().getFullYear();
this.selectedYear = year;
this.selectedQuarter = "";
this.yearPicker.setValue(year);
this.quarter.setValue();
} else {
this.selectedYear = BI.parseInt(obj.year);
this.selectedQuarter = BI.parseInt(obj.quarter);
this.selectedYear = BI.parseInt(newObj.year);
this.selectedQuarter = BI.parseInt(newObj.quarter);
this.yearPicker.setValue(this.selectedYear);
this.quarter.setValue(this.selectedQuarter);
}
@ -110319,9 +110314,10 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
self.combo.isViewVisible() && self.combo.hideView();
});
this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM, function () {
if (self.combo.isViewVisible()) {
return;
}
// 没看出来干啥的，先去掉
// if (self.combo.isViewVisible()) {
// return;
// }
var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey();
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {

26
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

52
dist/widget.js vendored
Unescape View File

@ -3317,10 +3317,7 @@ BI.extend(BI.DynamicDateCard, {
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
this._checkDynamicValue(this.storeValue);
},
_checkDynamicValue: function (v) {
@ -4180,10 +4177,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
this._checkDynamicValue(this.storeValue);
},
_checkDynamicValue: function (v) {
@ -21462,18 +21456,18 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
setValue: function (obj) {
var o = this.options;
obj = obj || {};
obj.year = obj.year || 0;
obj.month = obj.month || 0;
if (obj.year === 0 || obj.month === 0 || BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
var year = obj.year || BI.getDate().getFullYear();
var newObj = {};
newObj.year = obj.year || 0;
newObj.month = obj.month || 0;
if (newObj.year === 0 || newObj.month === 0 || BI.checkDateVoid(newObj.year, newObj.month, 1, o.min, o.max)[0]) {
var year = newObj.year || BI.getDate().getFullYear();
this.selectedYear = year;
this.selectedMonth = "";
this.yearPicker.setValue(year);
this.month.setValue();
} else {
this.selectedYear = BI.parseInt(obj.year);
this.selectedMonth = BI.parseInt(obj.month);
this.selectedYear = BI.parseInt(newObj.year);
this.selectedMonth = BI.parseInt(newObj.month);
this.yearPicker.setValue(this.selectedYear);
this.month.setValue(this.selectedMonth);
}
@ -21519,9 +21513,10 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.DynamicYearMonthCombo.EVENT_VALID);
});
this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_CONFIRM, function () {
if (self.combo.isViewVisible()) {
return;
}
// 没看出来干啥的，先去掉
// if (self.combo.isViewVisible()) {
// return;
// }
var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey();
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {
@ -22463,18 +22458,18 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
setValue: function (obj) {
var o = this.options;
obj = obj || {};
obj.year = obj.year || 0;
obj.quarter = obj.quarter || 0;
if (obj.quarter === 0 || obj.year === 0 || BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
var year = obj.year || BI.getDate().getFullYear();
var newObj = {};
newObj.year = obj.year || 0;
newObj.quarter = obj.quarter || 0;
if (newObj.quarter === 0 || newObj.year === 0 || BI.checkDateVoid(newObj.year, newObj.quarter, 1, o.min, o.max)[0]) {
var year = newObj.year || BI.getDate().getFullYear();
this.selectedYear = year;
this.selectedQuarter = "";
this.yearPicker.setValue(year);
this.quarter.setValue();
} else {
this.selectedYear = BI.parseInt(obj.year);
this.selectedQuarter = BI.parseInt(obj.quarter);
this.selectedYear = BI.parseInt(newObj.year);
this.selectedQuarter = BI.parseInt(newObj.quarter);
this.yearPicker.setValue(this.selectedYear);
this.quarter.setValue(this.selectedQuarter);
}
@ -22516,9 +22511,10 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
self.combo.isViewVisible() && self.combo.hideView();
});
this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM, function () {
if (self.combo.isViewVisible()) {
return;
}
// 没看出来干啥的，先去掉
// if (self.combo.isViewVisible()) {
// return;
// }
var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey();
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {

5
src/widget/dynamicdate/dynamicdate.combo.js
Unescape View File

@ -211,10 +211,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
this._checkDynamicValue(this.storeValue);
},
_checkDynamicValue: function (v) {

5
src/widget/dynamicdatetime/dynamicdatetime.combo.js
Unescape View File

@ -214,10 +214,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
this._checkDynamicValue(this.storeValue);
},
_checkDynamicValue: function (v) {

14
src/widget/yearmonth/card.static.yearmonth.js
Unescape View File

@ -96,18 +96,18 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
setValue: function (obj) {
var o = this.options;
obj = obj || {};
obj.year = obj.year || 0;
obj.month = obj.month || 0;
if (obj.year === 0 || obj.month === 0 || BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
var year = obj.year || BI.getDate().getFullYear();
var newObj = {};
newObj.year = obj.year || 0;
newObj.month = obj.month || 0;
if (newObj.year === 0 || newObj.month === 0 || BI.checkDateVoid(newObj.year, newObj.month, 1, o.min, o.max)[0]) {
var year = newObj.year || BI.getDate().getFullYear();
this.selectedYear = year;
this.selectedMonth = "";
this.yearPicker.setValue(year);
this.month.setValue();
} else {
this.selectedYear = BI.parseInt(obj.year);
this.selectedMonth = BI.parseInt(obj.month);
this.selectedYear = BI.parseInt(newObj.year);
this.selectedMonth = BI.parseInt(newObj.month);
this.yearPicker.setValue(this.selectedYear);
this.month.setValue(this.selectedMonth);
}

7
src/widget/yearmonth/combo.yearmonth.js
Unescape View File

@ -36,9 +36,10 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.DynamicYearMonthCombo.EVENT_VALID);
});
this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_CONFIRM, function () {
if (self.combo.isViewVisible()) {
return;
}
// 没看出来干啥的，先去掉
// if (self.combo.isViewVisible()) {
// return;
// }
var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey();
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {

14
src/widget/yearquarter/card.static.yearquarter.js
Unescape View File

@ -88,18 +88,18 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
setValue: function (obj) {
var o = this.options;
obj = obj || {};
obj.year = obj.year || 0;
obj.quarter = obj.quarter || 0;
if (obj.quarter === 0 || obj.year === 0 || BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
var year = obj.year || BI.getDate().getFullYear();
var newObj = {};
newObj.year = obj.year || 0;
newObj.quarter = obj.quarter || 0;
if (newObj.quarter === 0 || newObj.year === 0 || BI.checkDateVoid(newObj.year, newObj.quarter, 1, o.min, o.max)[0]) {
var year = newObj.year || BI.getDate().getFullYear();
this.selectedYear = year;
this.selectedQuarter = "";
this.yearPicker.setValue(year);
this.quarter.setValue();
} else {
this.selectedYear = BI.parseInt(obj.year);
this.selectedQuarter = BI.parseInt(obj.quarter);
this.selectedYear = BI.parseInt(newObj.year);
this.selectedQuarter = BI.parseInt(newObj.quarter);
this.yearPicker.setValue(this.selectedYear);
this.quarter.setValue(this.selectedQuarter);
}

7
src/widget/yearquarter/combo.yearquarter.js
Unescape View File

@ -32,9 +32,10 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
self.combo.isViewVisible() && self.combo.hideView();
});
this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM, function () {
if (self.combo.isViewVisible()) {
return;
}
// 没看出来干啥的，先去掉
// if (self.combo.isViewVisible()) {
// return;
// }
var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey();
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {

Write Preview
Loading…
Cancel
Save