Browse Source

替换多了BI.getDate

es6
windy 7 years ago
parent
commit
0c067cdbde
  1. 4
      demo/js/case/demo.calendar.js
  2. 20
      dist/bundle.js
  3. 20
      dist/bundle.min.js
  4. 6
      dist/core.js
  5. 4
      dist/demo.js
  6. 20
      dist/fineui.js
  7. 30
      dist/fineui.min.js
  8. 14
      dist/widget.js
  9. 4
      src/core/alias.js
  10. 2
      src/core/proto/date.js
  11. 4
      src/widget/date/trigger.date.js
  12. 2
      src/widget/datetime/datetime.combo.js
  13. 2
      src/widget/datetime/datetime.popup.js
  14. 2
      src/widget/multidate/multidate.combo.js
  15. 4
      src/widget/multidate/multidate.popup.js
  16. 6
      utils/utils.js

4
demo/js/case/demo.calendar.js

@ -16,7 +16,7 @@ Demo.Func = BI.inherit(BI.Widget, {
},
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
};
},
@ -25,7 +25,7 @@ Demo.Func = BI.inherit(BI.Widget, {
this.calendar.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
}
});

20
dist/bundle.js vendored

@ -25487,9 +25487,9 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
break;
case "d": // 日
if (len > 1) {
str = BI.leftPad(BI.getDate() + "", 2, "0");
str = BI.leftPad(date.getDate() + "", 2, "0");
} else {
str = BI.getDate();
str = date.getDate();
}
break;
case "h": // 时(12)
@ -28722,7 +28722,7 @@ Date.prototype.getWeekEndDate = function () {
Date.prototype.equalsTo = function (date) {
return ((this.getFullYear() == date.getFullYear()) &&
(this.getMonth() == date.getMonth()) &&
(this.getDate() == BI.getDate()) &&
(this.getDate() == date.getDate()) &&
(this.getHours() == date.getHours()) &&
(this.getMinutes() == date.getMinutes()) &&
(this.getSeconds() == date.getSeconds()));
@ -85417,12 +85417,12 @@ BI.shortcut("bi.date_combo", BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
switch (type) {
case BI.DateTrigger.MULTI_DATE_YEAR_PREV:
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_PREV];
date = BI.getDate((date.getFullYear() - 1 * value), date.getMonth(), BI.getDate());
date = BI.getDate((date.getFullYear() - 1 * value), date.getMonth(), date.getDate());
_setInnerValue(date, text);
break;
case BI.DateTrigger.MULTI_DATE_YEAR_AFTER:
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_AFTER];
date = BI.getDate((date.getFullYear() + 1 * value), date.getMonth(), BI.getDate());
date = BI.getDate((date.getFullYear() + 1 * value), date.getMonth(), date.getDate());
_setInnerValue(date, text);
break;
case BI.DateTrigger.MULTI_DATE_YEAR_BEGIN:
@ -85729,7 +85729,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate(),
day: date.getDate(),
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
@ -85972,7 +85972,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
this.hour.setValue(date.getHours());
this.minute.setValue(date.getMinutes());
@ -89116,7 +89116,7 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
self.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
self.combo.hideView();
self.fireEvent(BI.MultiDateCombo.EVENT_CONFIRM);
@ -89556,7 +89556,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
self.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
self._setInnerValue(self.ymd);
break;
@ -89676,7 +89676,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
this.textButton.setValue(BI.i18nText("BI-Multi_Date_Today"));
} else {

20
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/core.js vendored

@ -25487,9 +25487,9 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
break;
case "d": // 日
if (len > 1) {
str = BI.leftPad(BI.getDate() + "", 2, "0");
str = BI.leftPad(date.getDate() + "", 2, "0");
} else {
str = BI.getDate();
str = date.getDate();
}
break;
case "h": // 时(12)
@ -28722,7 +28722,7 @@ Date.prototype.getWeekEndDate = function () {
Date.prototype.equalsTo = function (date) {
return ((this.getFullYear() == date.getFullYear()) &&
(this.getMonth() == date.getMonth()) &&
(this.getDate() == BI.getDate()) &&
(this.getDate() == date.getDate()) &&
(this.getHours() == date.getHours()) &&
(this.getMinutes() == date.getMinutes()) &&
(this.getSeconds() == date.getSeconds()));

4
dist/demo.js vendored

@ -2300,7 +2300,7 @@ BI.shortcut("demo.text_value_check_combo", Demo.TextValueCheckCombo);Demo.Func =
},
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
};
},
@ -2309,7 +2309,7 @@ BI.shortcut("demo.text_value_check_combo", Demo.TextValueCheckCombo);Demo.Func =
this.calendar.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
}
});

20
dist/fineui.js vendored

@ -25688,9 +25688,9 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
break;
case "d": // 日
if (len > 1) {
str = BI.leftPad(BI.getDate() + "", 2, "0");
str = BI.leftPad(date.getDate() + "", 2, "0");
} else {
str = BI.getDate();
str = date.getDate();
}
break;
case "h": // 时(12)
@ -28923,7 +28923,7 @@ Date.prototype.getWeekEndDate = function () {
Date.prototype.equalsTo = function (date) {
return ((this.getFullYear() == date.getFullYear()) &&
(this.getMonth() == date.getMonth()) &&
(this.getDate() == BI.getDate()) &&
(this.getDate() == date.getDate()) &&
(this.getHours() == date.getHours()) &&
(this.getMinutes() == date.getMinutes()) &&
(this.getSeconds() == date.getSeconds()));
@ -87181,12 +87181,12 @@ BI.shortcut("bi.date_combo", BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
switch (type) {
case BI.DateTrigger.MULTI_DATE_YEAR_PREV:
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_PREV];
date = BI.getDate((date.getFullYear() - 1 * value), date.getMonth(), BI.getDate());
date = BI.getDate((date.getFullYear() - 1 * value), date.getMonth(), date.getDate());
_setInnerValue(date, text);
break;
case BI.DateTrigger.MULTI_DATE_YEAR_AFTER:
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_AFTER];
date = BI.getDate((date.getFullYear() + 1 * value), date.getMonth(), BI.getDate());
date = BI.getDate((date.getFullYear() + 1 * value), date.getMonth(), date.getDate());
_setInnerValue(date, text);
break;
case BI.DateTrigger.MULTI_DATE_YEAR_BEGIN:
@ -87493,7 +87493,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate(),
day: date.getDate(),
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
@ -87736,7 +87736,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
this.hour.setValue(date.getHours());
this.minute.setValue(date.getMinutes());
@ -90880,7 +90880,7 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
self.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
self.combo.hideView();
self.fireEvent(BI.MultiDateCombo.EVENT_CONFIRM);
@ -91320,7 +91320,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
self.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
self._setInnerValue(self.ymd);
break;
@ -91440,7 +91440,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
this.textButton.setValue(BI.i18nText("BI-Multi_Date_Today"));
} else {

30
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

14
dist/widget.js vendored

@ -1066,12 +1066,12 @@ BI.shortcut("bi.date_combo", BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
switch (type) {
case BI.DateTrigger.MULTI_DATE_YEAR_PREV:
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_PREV];
date = BI.getDate((date.getFullYear() - 1 * value), date.getMonth(), BI.getDate());
date = BI.getDate((date.getFullYear() - 1 * value), date.getMonth(), date.getDate());
_setInnerValue(date, text);
break;
case BI.DateTrigger.MULTI_DATE_YEAR_AFTER:
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_AFTER];
date = BI.getDate((date.getFullYear() + 1 * value), date.getMonth(), BI.getDate());
date = BI.getDate((date.getFullYear() + 1 * value), date.getMonth(), date.getDate());
_setInnerValue(date, text);
break;
case BI.DateTrigger.MULTI_DATE_YEAR_BEGIN:
@ -1378,7 +1378,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate(),
day: date.getDate(),
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
@ -1621,7 +1621,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
this.hour.setValue(date.getHours());
this.minute.setValue(date.getMinutes());
@ -4765,7 +4765,7 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
self.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
self.combo.hideView();
self.fireEvent(BI.MultiDateCombo.EVENT_CONFIRM);
@ -5205,7 +5205,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
self.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
self._setInnerValue(self.ymd);
break;
@ -5325,7 +5325,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
this.textButton.setValue(BI.i18nText("BI-Multi_Date_Today"));
} else {

4
src/core/alias.js

@ -573,9 +573,9 @@
break;
case "d": // 日
if (len > 1) {
str = BI.leftPad(BI.getDate() + "", 2, "0");
str = BI.leftPad(date.getDate() + "", 2, "0");
} else {
str = BI.getDate();
str = date.getDate();
}
break;
case "h": // 时(12)

2
src/core/proto/date.js

@ -149,7 +149,7 @@ Date.prototype.getWeekEndDate = function () {
Date.prototype.equalsTo = function (date) {
return ((this.getFullYear() == date.getFullYear()) &&
(this.getMonth() == date.getMonth()) &&
(this.getDate() == BI.getDate()) &&
(this.getDate() == date.getDate()) &&
(this.getHours() == date.getHours()) &&
(this.getMinutes() == date.getMinutes()) &&
(this.getSeconds() == date.getSeconds()));

4
src/widget/date/trigger.date.js

@ -150,12 +150,12 @@ BI.DateTrigger = BI.inherit(BI.Trigger, {
switch (type) {
case BI.DateTrigger.MULTI_DATE_YEAR_PREV:
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_PREV];
date = BI.getDate((date.getFullYear() - 1 * value), date.getMonth(), BI.getDate());
date = BI.getDate((date.getFullYear() - 1 * value), date.getMonth(), date.getDate());
_setInnerValue(date, text);
break;
case BI.DateTrigger.MULTI_DATE_YEAR_AFTER:
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_AFTER];
date = BI.getDate((date.getFullYear() + 1 * value), date.getMonth(), BI.getDate());
date = BI.getDate((date.getFullYear() + 1 * value), date.getMonth(), date.getDate());
_setInnerValue(date, text);
break;
case BI.DateTrigger.MULTI_DATE_YEAR_BEGIN:

2
src/widget/datetime/datetime.combo.js

@ -24,7 +24,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate(),
day: date.getDate(),
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()

2
src/widget/datetime/datetime.popup.js

@ -134,7 +134,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
this.hour.setValue(date.getHours());
this.minute.setValue(date.getMinutes());

2
src/widget/multidate/multidate.combo.js

@ -95,7 +95,7 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
self.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
self.combo.hideView();
self.fireEvent(BI.MultiDateCombo.EVENT_CONFIRM);

4
src/widget/multidate/multidate.popup.js

@ -161,7 +161,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
self.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
self._setInnerValue(self.ymd);
break;
@ -281,7 +281,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: BI.getDate()
day: date.getDate()
});
this.textButton.setValue(BI.i18nText("BI-Multi_Date_Today"));
} else {

6
utils/utils.js

@ -9865,7 +9865,7 @@ Date.prototype.getWeekEndDate = function () {
Date.prototype.equalsTo = function (date) {
return ((this.getFullYear() == date.getFullYear()) &&
(this.getMonth() == date.getMonth()) &&
(this.getDate() == BI.getDate()) &&
(this.getDate() == date.getDate()) &&
(this.getHours() == date.getHours()) &&
(this.getMinutes() == date.getMinutes()) &&
(this.getSeconds() == date.getSeconds()));
@ -12221,9 +12221,9 @@ _.extend(BI.OB.prototype, {
break;
case "d": // 日
if (len > 1) {
str = BI.leftPad(BI.getDate() + "", 2, "0");
str = BI.leftPad(date.getDate() + "", 2, "0");
} else {
str = BI.getDate();
str = date.getDate();
}
break;
case "h": // 时(12)

Loading…
Cancel
Save