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