|
|
|
@ -11695,7 +11695,7 @@ if (!window.BI) { |
|
|
|
|
|
|
|
|
|
|
|
// Date
|
|
|
|
// Date
|
|
|
|
if (type === '[object Date]') { |
|
|
|
if (type === '[object Date]') { |
|
|
|
return new Date(obj.getTime()); |
|
|
|
return Date.getDate(obj.getTime()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var i, clone, key; |
|
|
|
var i, clone, key; |
|
|
|
@ -11925,7 +11925,7 @@ if (!window.BI) { |
|
|
|
if (Date.now) { |
|
|
|
if (Date.now) { |
|
|
|
return Date.now(); |
|
|
|
return Date.now(); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return new Date().getTime(); |
|
|
|
return Date.getDate().getTime(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -18776,9 +18776,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, { |
|
|
|
tooltip.visible(); |
|
|
|
tooltip.visible(); |
|
|
|
tooltip.element.height(tooltip.element[0].scrollHeight); |
|
|
|
tooltip.element.height(tooltip.element[0].scrollHeight); |
|
|
|
this.showingTips[name] = true; |
|
|
|
this.showingTips[name] = true; |
|
|
|
var x = e.pageX || e.clientX, y = (e.pageY || e.clientY) + 15; |
|
|
|
var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15; |
|
|
|
if (x + tooltip.element.outerWidth() > $("body").outerWidth()) { |
|
|
|
if (x + tooltip.element.outerWidth() > $("body").outerWidth()) { |
|
|
|
x -= tooltip.element.outerWidth(); |
|
|
|
x -= tooltip.element.outerWidth() + 15; |
|
|
|
} |
|
|
|
} |
|
|
|
if (y + tooltip.element.outerHeight() > $("body").outerHeight()) { |
|
|
|
if (y + tooltip.element.outerHeight() > $("body").outerHeight()) { |
|
|
|
y -= tooltip.element.outerHeight() + 15; |
|
|
|
y -= tooltip.element.outerHeight() + 15; |
|
|
|
@ -20846,20 +20846,21 @@ Date.prototype.getMonthDays = function (month) { |
|
|
|
* @returns {Date} |
|
|
|
* @returns {Date} |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
Date.prototype.getLastDateOfMonth = function () { |
|
|
|
Date.prototype.getLastDateOfMonth = function () { |
|
|
|
return new Date(this.getFullYear(), this.getMonth(), this.getMonthDays()); |
|
|
|
return Date.getDate(this.getFullYear(), this.getMonth(), this.getMonthDays()); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** Returns the number of day in the year. */ |
|
|
|
/** Returns the number of day in the year. */ |
|
|
|
Date.prototype.getDayOfYear = function () { |
|
|
|
Date.prototype.getDayOfYear = function () { |
|
|
|
var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0); |
|
|
|
var now = Date.getDate(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0); |
|
|
|
var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0); |
|
|
|
var then = Date.getDate(this.getFullYear(), 0, 0, 0, 0, 0); |
|
|
|
var time = now - then; |
|
|
|
var time = now - then; |
|
|
|
return Math.floor(time / Date.DAY); |
|
|
|
return Math.floor(time / Date.DAY); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** Returns the number of the week in year, as defined in ISO 8601. */ |
|
|
|
/** Returns the number of the week in year, as defined in ISO 8601. */ |
|
|
|
Date.prototype.getWeekNumber = function () { |
|
|
|
Date.prototype.getWeekNumber = function () { |
|
|
|
var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0); |
|
|
|
var d = Date.getDate(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0); |
|
|
|
|
|
|
|
//周一是一周第一天
|
|
|
|
var week = d.getDay(); |
|
|
|
var week = d.getDay(); |
|
|
|
if (this.getMonth() === 0 && this.getDate() <= week) { |
|
|
|
if (this.getMonth() === 0 && this.getDate() <= week) { |
|
|
|
return 1; |
|
|
|
return 1; |
|
|
|
@ -20875,19 +20876,23 @@ Date.prototype.getWeekNumber = function () { |
|
|
|
return offset; |
|
|
|
return offset; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Date.prototype.getQuarter = function () { |
|
|
|
|
|
|
|
return Math.floor(this.getMonth() / 3) + 1; |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
//离当前时间多少天的时间
|
|
|
|
//离当前时间多少天的时间
|
|
|
|
Date.prototype.getOffsetDate = function (offset) { |
|
|
|
Date.prototype.getOffsetDate = function (offset) { |
|
|
|
return new Date(this.getTime() + offset * 864e5); |
|
|
|
return Date.getDate(this.getTime() + offset * 864e5); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
Date.prototype.getAfterMulQuarter = function (n) { |
|
|
|
Date.prototype.getAfterMulQuarter = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
dt.setMonth(dt.getMonth() + n * 3); |
|
|
|
dt.setMonth(dt.getMonth() + n * 3); |
|
|
|
return dt; |
|
|
|
return dt; |
|
|
|
}; |
|
|
|
}; |
|
|
|
//获得n个季度前的日期
|
|
|
|
//获得n个季度前的日期
|
|
|
|
Date.prototype.getBeforeMulQuarter = function (n) { |
|
|
|
Date.prototype.getBeforeMulQuarter = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
dt.setMonth(dt.getMonth() - n * 3); |
|
|
|
dt.setMonth(dt.getMonth() - n * 3); |
|
|
|
return dt; |
|
|
|
return dt; |
|
|
|
}; |
|
|
|
}; |
|
|
|
@ -20911,32 +20916,32 @@ Date.prototype.getQuarterStartMonth = function () { |
|
|
|
}; |
|
|
|
}; |
|
|
|
//获得本季度的起始日期
|
|
|
|
//获得本季度的起始日期
|
|
|
|
Date.prototype.getQuarterStartDate = function () { |
|
|
|
Date.prototype.getQuarterStartDate = function () { |
|
|
|
return new Date(this.getFullYear(), this.getQuarterStartMonth(), 1); |
|
|
|
return Date.getDate(this.getFullYear(), this.getQuarterStartMonth(), 1); |
|
|
|
}; |
|
|
|
}; |
|
|
|
//得到本季度的结束日期
|
|
|
|
//得到本季度的结束日期
|
|
|
|
Date.prototype.getQuarterEndDate = function () { |
|
|
|
Date.prototype.getQuarterEndDate = function () { |
|
|
|
var quarterEndMonth = this.getQuarterStartMonth() + 2; |
|
|
|
var quarterEndMonth = this.getQuarterStartMonth() + 2; |
|
|
|
return new Date(this.getFullYear(), quarterEndMonth, this.getMonthDays(quarterEndMonth)); |
|
|
|
return Date.getDate(this.getFullYear(), quarterEndMonth, this.getMonthDays(quarterEndMonth)); |
|
|
|
}; |
|
|
|
}; |
|
|
|
Date.prototype.getAfterMultiMonth = function (n) { |
|
|
|
Date.prototype.getAfterMultiMonth = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
dt.setMonth(dt.getMonth() + n | 0); |
|
|
|
dt.setMonth(dt.getMonth() + n | 0); |
|
|
|
return dt; |
|
|
|
return dt; |
|
|
|
}; |
|
|
|
}; |
|
|
|
Date.prototype.getBeforeMultiMonth = function (n) { |
|
|
|
Date.prototype.getBeforeMultiMonth = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
dt.setMonth(dt.getMonth() - n | 0); |
|
|
|
dt.setMonth(dt.getMonth() - n | 0); |
|
|
|
return dt; |
|
|
|
return dt; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
Date.prototype.getAfterMulQuarter = function (n) { |
|
|
|
Date.prototype.getAfterMulQuarter = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
dt.setMonth(dt.getMonth() + n * 3); |
|
|
|
dt.setMonth(dt.getMonth() + n * 3); |
|
|
|
return dt; |
|
|
|
return dt; |
|
|
|
}; |
|
|
|
}; |
|
|
|
//获得n个季度前的日期
|
|
|
|
//获得n个季度前的日期
|
|
|
|
Date.prototype.getBeforeMulQuarter = function (n) { |
|
|
|
Date.prototype.getBeforeMulQuarter = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
dt.setMonth(dt.getMonth() - n * 3); |
|
|
|
dt.setMonth(dt.getMonth() - n * 3); |
|
|
|
return dt; |
|
|
|
return dt; |
|
|
|
}; |
|
|
|
}; |
|
|
|
@ -20961,9 +20966,9 @@ Date.prototype.getQuarterStartMonth = function () { |
|
|
|
|
|
|
|
|
|
|
|
//指定日期n个月之前或之后的日期
|
|
|
|
//指定日期n个月之前或之后的日期
|
|
|
|
Date.prototype.getOffsetMonth = function (n) { |
|
|
|
Date.prototype.getOffsetMonth = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
var day = dt.getDate(); |
|
|
|
var day = dt.getDate(); |
|
|
|
var monthDay = new Date(dt.getFullYear(), dt.getMonth() + parseInt(n), 1).getMonthDays(); |
|
|
|
var monthDay = Date.getDate(dt.getFullYear(), dt.getMonth() + parseInt(n), 1).getMonthDays(); |
|
|
|
if (day > monthDay) { |
|
|
|
if (day > monthDay) { |
|
|
|
day = monthDay; |
|
|
|
day = monthDay; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -20986,31 +20991,31 @@ Date.prototype.getWeekEndDate = function () { |
|
|
|
|
|
|
|
|
|
|
|
//获得本季度的起始日期
|
|
|
|
//获得本季度的起始日期
|
|
|
|
Date.prototype.getQuarterStartDate = function () { |
|
|
|
Date.prototype.getQuarterStartDate = function () { |
|
|
|
return new Date(this.getFullYear(), this.getQuarterStartMonth(), 1); |
|
|
|
return Date.getDate(this.getFullYear(), this.getQuarterStartMonth(), 1); |
|
|
|
}; |
|
|
|
}; |
|
|
|
//得到本季度的结束日期
|
|
|
|
//得到本季度的结束日期
|
|
|
|
Date.prototype.getQuarterEndDate = function () { |
|
|
|
Date.prototype.getQuarterEndDate = function () { |
|
|
|
var quarterEndMonth = this.getQuarterStartMonth() + 2; |
|
|
|
var quarterEndMonth = this.getQuarterStartMonth() + 2; |
|
|
|
return new Date(this.getFullYear(), quarterEndMonth, this.getMonthDays(quarterEndMonth)); |
|
|
|
return Date.getDate(this.getFullYear(), quarterEndMonth, this.getMonthDays(quarterEndMonth)); |
|
|
|
}; |
|
|
|
}; |
|
|
|
Date.prototype.getAfterMultiMonth = function (n) { |
|
|
|
Date.prototype.getAfterMultiMonth = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
dt.setMonth(dt.getMonth() + n | 0); |
|
|
|
dt.setMonth(dt.getMonth() + n | 0); |
|
|
|
return dt; |
|
|
|
return dt; |
|
|
|
}; |
|
|
|
}; |
|
|
|
Date.prototype.getBeforeMultiMonth = function (n) { |
|
|
|
Date.prototype.getBeforeMultiMonth = function (n) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
dt.setMonth(dt.getMonth() - n | 0); |
|
|
|
dt.setMonth(dt.getMonth() - n | 0); |
|
|
|
return dt; |
|
|
|
return dt; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
//获得当前时区对应指定时区的时间
|
|
|
|
//获得当前时区对应指定时区的时间
|
|
|
|
Date.prototype.getTimeZoneTimeByTimezoneOffset = function (offset) { |
|
|
|
Date.prototype.getTimeZoneTimeByTimezoneOffset = function (offset) { |
|
|
|
var dt = new Date(this.getTime()); |
|
|
|
var dt = Date.getDate(this.getTime()); |
|
|
|
var localTime = dt.getTime(); |
|
|
|
var localTime = dt.getTime(); |
|
|
|
var localOffset = dt.getTimezoneOffset() * 60000; //获得当地时间偏移的毫秒数
|
|
|
|
var localOffset = dt.getTimezoneOffset() * 60000; //获得当地时间偏移的毫秒数
|
|
|
|
var utc = localTime + localOffset; //utc即GMT时间标准时区
|
|
|
|
var utc = localTime + localOffset; //utc即GMT时间标准时区
|
|
|
|
return new Date(utc + offset); |
|
|
|
return Date.getDate(utc + offset); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** Checks date and time equality */ |
|
|
|
/** Checks date and time equality */ |
|
|
|
@ -21025,7 +21030,7 @@ Date.prototype.equalsTo = function (date) { |
|
|
|
|
|
|
|
|
|
|
|
/** Set only the year, month, date parts (keep existing time) */ |
|
|
|
/** Set only the year, month, date parts (keep existing time) */ |
|
|
|
Date.prototype.setDateOnly = function (date) { |
|
|
|
Date.prototype.setDateOnly = function (date) { |
|
|
|
var tmp = new Date(date); |
|
|
|
var tmp = Date.getDate(date); |
|
|
|
this.setDate(1); |
|
|
|
this.setDate(1); |
|
|
|
this.setFullYear(tmp.getFullYear()); |
|
|
|
this.setFullYear(tmp.getFullYear()); |
|
|
|
this.setMonth(tmp.getMonth()); |
|
|
|
this.setMonth(tmp.getMonth()); |
|
|
|
@ -21037,6 +21042,7 @@ Date.prototype.print = function (str) { |
|
|
|
var d = this.getDate(); |
|
|
|
var d = this.getDate(); |
|
|
|
var y = this.getFullYear(); |
|
|
|
var y = this.getFullYear(); |
|
|
|
var wn = this.getWeekNumber(); |
|
|
|
var wn = this.getWeekNumber(); |
|
|
|
|
|
|
|
var qr = this.getQuarter(); |
|
|
|
var w = this.getDay(); |
|
|
|
var w = this.getDay(); |
|
|
|
var s = {}; |
|
|
|
var s = {}; |
|
|
|
var hr = this.getHours(); |
|
|
|
var hr = this.getHours(); |
|
|
|
@ -21083,6 +21089,7 @@ Date.prototype.print = function (str) { |
|
|
|
s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
|
|
|
|
s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
|
|
|
|
s["%Y"] = y; // year with the century
|
|
|
|
s["%Y"] = y; // year with the century
|
|
|
|
s["%%"] = "%"; // a literal '%' character
|
|
|
|
s["%%"] = "%"; // a literal '%' character
|
|
|
|
|
|
|
|
s["%Q"] = qr; |
|
|
|
|
|
|
|
|
|
|
|
var re = /%./g; |
|
|
|
var re = /%./g; |
|
|
|
if (!BI.isKhtml()) { |
|
|
|
if (!BI.isKhtml()) { |
|
|
|
@ -21171,7 +21178,7 @@ Date.checkLegal = function (str) { |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
Date.parseDateTime = function (str, fmt) { |
|
|
|
Date.parseDateTime = function (str, fmt) { |
|
|
|
var today = new Date(); |
|
|
|
var today = Date.getDate(); |
|
|
|
var y = 0; |
|
|
|
var y = 0; |
|
|
|
var m = 0; |
|
|
|
var m = 0; |
|
|
|
var d = 1; |
|
|
|
var d = 1; |
|
|
|
@ -21264,7 +21271,7 @@ Date.parseDateTime = function (str, fmt) { |
|
|
|
sec = today.getSeconds(); |
|
|
|
sec = today.getSeconds(); |
|
|
|
} |
|
|
|
} |
|
|
|
if (y != 0) { |
|
|
|
if (y != 0) { |
|
|
|
return new Date(y, m, d, hr, min, sec); |
|
|
|
return Date.getDate(y, m, d, hr, min, sec); |
|
|
|
} |
|
|
|
} |
|
|
|
y = 0; |
|
|
|
y = 0; |
|
|
|
m = -1; |
|
|
|
m = -1; |
|
|
|
@ -21297,10 +21304,22 @@ Date.parseDateTime = function (str, fmt) { |
|
|
|
y = today.getFullYear(); |
|
|
|
y = today.getFullYear(); |
|
|
|
} |
|
|
|
} |
|
|
|
if (m != -1 && d != 0) { |
|
|
|
if (m != -1 && d != 0) { |
|
|
|
return new Date(y, m, d, hr, min, sec); |
|
|
|
return Date.getDate(y, m, d, hr, min, sec); |
|
|
|
} |
|
|
|
} |
|
|
|
return today; |
|
|
|
return today; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Date.getDate = function () { |
|
|
|
|
|
|
|
var dt = new (Function.prototype.bind.apply(Date, BI.concat([null], [].slice.apply(arguments))))(); |
|
|
|
|
|
|
|
if(BI.isNotNull(Date.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))){ |
|
|
|
|
|
|
|
var localTime = dt.getTime(); |
|
|
|
|
|
|
|
var localOffset = dt.getTimezoneOffset() * 60000; //获得当地时间偏移的毫秒数
|
|
|
|
|
|
|
|
var utc = localTime + localOffset; //utc即GMT时间标准时区
|
|
|
|
|
|
|
|
return new Date(utc + Date.timeZone);//+ Pool.timeZone.offset);
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
return dt; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
/* |
|
|
|
/* |
|
|
|
* 给jQuery.Event对象添加的工具方法 |
|
|
|
* 给jQuery.Event对象添加的工具方法 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@ -40225,7 +40244,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, { |
|
|
|
textWrapping: true, |
|
|
|
textWrapping: true, |
|
|
|
lineWrapping: true, |
|
|
|
lineWrapping: true, |
|
|
|
lineNumbers: false, |
|
|
|
lineNumbers: false, |
|
|
|
mode: 'formula' |
|
|
|
mode: 'formula', |
|
|
|
|
|
|
|
//解决插入字段由括号或其他特殊字符包围时分裂的bug
|
|
|
|
|
|
|
|
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/ |
|
|
|
}); |
|
|
|
}); |
|
|
|
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height"); |
|
|
|
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height"); |
|
|
|
this.editor.on("change", function (cm, change) { |
|
|
|
this.editor.on("change", function (cm, change) { |
|
|
|
@ -40316,7 +40337,8 @@ BI.FormulaEditor = BI.inherit(BI.Single, { |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
insertField: function (field) { |
|
|
|
insertField: function (field) { |
|
|
|
var from = this.editor.getCursor(); |
|
|
|
var from = this.editor.getCursor(); |
|
|
|
this.editor.replaceSelection(field); |
|
|
|
//解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
|
|
|
|
|
|
|
|
this.editor.replaceSelection('\u200b' + field + '\u200b'); |
|
|
|
var to = this.editor.getCursor(); |
|
|
|
var to = this.editor.getCursor(); |
|
|
|
this.editor.markText(from, to, {className: 'fieldName', atomic: true, startStyle: "start", endStyle: "end"}); |
|
|
|
this.editor.markText(from, to, {className: 'fieldName', atomic: true, startStyle: "start", endStyle: "end"}); |
|
|
|
this.editor.replaceSelection(" "); |
|
|
|
this.editor.replaceSelection(" "); |
|
|
|
@ -40367,7 +40389,8 @@ BI.FormulaEditor = BI.inherit(BI.Single, { |
|
|
|
_.forEach(line.markedSpans, function (i, ms) { |
|
|
|
_.forEach(line.markedSpans, function (i, ms) { |
|
|
|
switch (i.marker.className) { |
|
|
|
switch (i.marker.className) { |
|
|
|
case "fieldName": |
|
|
|
case "fieldName": |
|
|
|
var dId = fieldMap[value.substr(i.from, i.to - i.from)]; |
|
|
|
//因为插入字段的时候首尾加了不可见字符，所以首尾缩进一个字符
|
|
|
|
|
|
|
|
var dId = fieldMap[value.substr(i.from + 1, i.to - i.from - 2)]; |
|
|
|
if (!fields.contains(dId)) { |
|
|
|
if (!fields.contains(dId)) { |
|
|
|
fields.push(dId); |
|
|
|
fields.push(dId); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -40406,8 +40429,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, { |
|
|
|
switch (i.marker.className) { |
|
|
|
switch (i.marker.className) { |
|
|
|
case "fieldName": |
|
|
|
case "fieldName": |
|
|
|
var fieldNameLength = i.to - i.from; |
|
|
|
var fieldNameLength = i.to - i.from; |
|
|
|
var fieldId = fieldMap[value.substr(i.from + num, fieldNameLength)]; |
|
|
|
var start = i.from + num + 1; |
|
|
|
value = value.substr(0, i.from + num) + "$\{" + fieldMap[value.substr(i.from + num, fieldNameLength)] + "\}" + value.substr(i.to + num, value.length); |
|
|
|
var end = fieldNameLength - 2; |
|
|
|
|
|
|
|
var fieldId = fieldMap[value.substr(start, end)]; |
|
|
|
|
|
|
|
value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length); |
|
|
|
num += fieldId.length - fieldNameLength + 3; |
|
|
|
num += fieldId.length - fieldNameLength + 3; |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -63094,7 +63119,7 @@ BI.Calendar = BI.inherit(BI.Widget, { |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
_dateCreator: function (Y, M, D) { |
|
|
|
_dateCreator: function (Y, M, D) { |
|
|
|
var self = this, o = this.options, log = {}, De = new Date(); |
|
|
|
var self = this, o = this.options, log = {}, De = Date.getDate(); |
|
|
|
var mins = o.min.match(/\d+/g); |
|
|
|
var mins = o.min.match(/\d+/g); |
|
|
|
var maxs = o.max.match(/\d+/g); |
|
|
|
var maxs = o.max.match(/\d+/g); |
|
|
|
Y < (mins[0] | 0) && (Y = (mins[0] | 0)); |
|
|
|
Y < (mins[0] | 0) && (Y = (mins[0] | 0)); |
|
|
|
@ -63204,7 +63229,7 @@ BI.Calendar = BI.inherit(BI.Widget, { |
|
|
|
|
|
|
|
|
|
|
|
isFrontDate: function () { |
|
|
|
isFrontDate: function () { |
|
|
|
var o = this.options, c = this._const; |
|
|
|
var o = this.options, c = this._const; |
|
|
|
var Y = o.year, M = o.month, De = new Date(), day = De.getDay(); |
|
|
|
var Y = o.year, M = o.month, De = Date.getDate(), day = De.getDay(); |
|
|
|
Y = Y | 0; |
|
|
|
Y = Y | 0; |
|
|
|
De.setFullYear(Y, M, 1); |
|
|
|
De.setFullYear(Y, M, 1); |
|
|
|
var newDate = De.getOffsetDate(-1 * (day + 1)); |
|
|
|
var newDate = De.getOffsetDate(-1 * (day + 1)); |
|
|
|
@ -63213,7 +63238,7 @@ BI.Calendar = BI.inherit(BI.Widget, { |
|
|
|
|
|
|
|
|
|
|
|
isFinalDate: function () { |
|
|
|
isFinalDate: function () { |
|
|
|
var o = this.options, c = this._const; |
|
|
|
var o = this.options, c = this._const; |
|
|
|
var Y = o.year, M = o.month, De = new Date(), day = De.getDay(); |
|
|
|
var Y = o.year, M = o.month, De = Date.getDate(), day = De.getDay(); |
|
|
|
Y = Y | 0; |
|
|
|
Y = Y | 0; |
|
|
|
De.setFullYear(Y, M, 1); |
|
|
|
De.setFullYear(Y, M, 1); |
|
|
|
var newDate = De.getOffsetDate(42 - day); |
|
|
|
var newDate = De.getOffsetDate(42 - day); |
|
|
|
@ -63236,14 +63261,14 @@ BI.Calendar = BI.inherit(BI.Widget, { |
|
|
|
|
|
|
|
|
|
|
|
BI.extend(BI.Calendar, { |
|
|
|
BI.extend(BI.Calendar, { |
|
|
|
getPageByDateJSON: function (json) { |
|
|
|
getPageByDateJSON: function (json) { |
|
|
|
var year = new Date().getFullYear(); |
|
|
|
var year = Date.getDate().getFullYear(); |
|
|
|
var month = new Date().getMonth(); |
|
|
|
var month = Date.getDate().getMonth(); |
|
|
|
var page = (json.year - year) * 12; |
|
|
|
var page = (json.year - year) * 12; |
|
|
|
page += json.month - month; |
|
|
|
page += json.month - month; |
|
|
|
return page; |
|
|
|
return page; |
|
|
|
}, |
|
|
|
}, |
|
|
|
getDateJSONByPage: function(v){ |
|
|
|
getDateJSONByPage: function(v){ |
|
|
|
var months = new Date().getMonth(); |
|
|
|
var months = Date.getDate().getMonth(); |
|
|
|
var page = v; |
|
|
|
var page = v; |
|
|
|
|
|
|
|
|
|
|
|
//对当前page做偏移,使到当前年初
|
|
|
|
//对当前page做偏移,使到当前年初
|
|
|
|
@ -63255,7 +63280,7 @@ BI.extend(BI.Calendar, { |
|
|
|
} |
|
|
|
} |
|
|
|
var month = page >= 0 ? (page % 12) : ((12 + page % 12) % 12); |
|
|
|
var month = page >= 0 ? (page % 12) : ((12 + page % 12) % 12); |
|
|
|
return { |
|
|
|
return { |
|
|
|
year: new Date().getFullYear() + year, |
|
|
|
year: Date.getDate().getFullYear() + year, |
|
|
|
month: month |
|
|
|
month: month |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -63301,7 +63326,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { |
|
|
|
_init: function () { |
|
|
|
_init: function () { |
|
|
|
BI.YearCalendar.superclass._init.apply(this, arguments); |
|
|
|
BI.YearCalendar.superclass._init.apply(this, arguments); |
|
|
|
var self = this, o = this.options; |
|
|
|
var self = this, o = this.options; |
|
|
|
this.currentYear = new Date().getFullYear(); |
|
|
|
this.currentYear = Date.getDate().getFullYear(); |
|
|
|
var years = this._yearCreator(o.year || this.currentYear); |
|
|
|
var years = this._yearCreator(o.year || this.currentYear); |
|
|
|
|
|
|
|
|
|
|
|
//纵向排列年
|
|
|
|
//纵向排列年
|
|
|
|
@ -63388,7 +63413,7 @@ BI.extend(BI.YearCalendar, { |
|
|
|
|
|
|
|
|
|
|
|
//获取显示的第一年
|
|
|
|
//获取显示的第一年
|
|
|
|
getStartYear: function (year) { |
|
|
|
getStartYear: function (year) { |
|
|
|
var cur = new Date().getFullYear(); |
|
|
|
var cur = Date.getDate().getFullYear(); |
|
|
|
return year - ((year - cur + 3) % BI.YearCalendar.INTERVAL + 12) % BI.YearCalendar.INTERVAL; |
|
|
|
return year - ((year - cur + 3) % BI.YearCalendar.INTERVAL + 12) % BI.YearCalendar.INTERVAL; |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
@ -63397,7 +63422,7 @@ BI.extend(BI.YearCalendar, { |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
getPageByYear: function (year) { |
|
|
|
getPageByYear: function (year) { |
|
|
|
var cur = new Date().getFullYear(); |
|
|
|
var cur = Date.getDate().getFullYear(); |
|
|
|
year = BI.YearCalendar.getStartYear(year); |
|
|
|
year = BI.YearCalendar.getStartYear(year); |
|
|
|
return (year - cur + 3) / BI.YearCalendar.INTERVAL; |
|
|
|
return (year - cur + 3) / BI.YearCalendar.INTERVAL; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -66909,6 +66934,125 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { |
|
|
|
}); |
|
|
|
}); |
|
|
|
BI.IconComboTrigger.EVENT_CHANGE = "EVENT_CHANGE"; |
|
|
|
BI.IconComboTrigger.EVENT_CHANGE = "EVENT_CHANGE"; |
|
|
|
BI.shortcut("bi.icon_combo_trigger", BI.IconComboTrigger);/** |
|
|
|
BI.shortcut("bi.icon_combo_trigger", BI.IconComboTrigger);/** |
|
|
|
|
|
|
|
* Created by Windy on 2017/12/12. |
|
|
|
|
|
|
|
* combo : icon + text + icon, popup : icon + text |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
BI.IconTextValueCombo = BI.inherit(BI.Widget, { |
|
|
|
|
|
|
|
_defaultConfig: function () { |
|
|
|
|
|
|
|
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), { |
|
|
|
|
|
|
|
baseClass: "bi-icon-text-value-combo", |
|
|
|
|
|
|
|
height: 30, |
|
|
|
|
|
|
|
text: "", |
|
|
|
|
|
|
|
el: {} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_init: function () { |
|
|
|
|
|
|
|
BI.IconTextValueCombo.superclass._init.apply(this, arguments); |
|
|
|
|
|
|
|
var self = this, o = this.options; |
|
|
|
|
|
|
|
this.trigger = BI.createWidget(o.el, { |
|
|
|
|
|
|
|
type: "bi.select_icon_text_trigger", |
|
|
|
|
|
|
|
items: o.items, |
|
|
|
|
|
|
|
height: o.height, |
|
|
|
|
|
|
|
text: o.text |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
this.popup = BI.createWidget({ |
|
|
|
|
|
|
|
type: "bi.icon_text_value_combo_popup", |
|
|
|
|
|
|
|
items: o.items |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () { |
|
|
|
|
|
|
|
self.setValue(self.popup.getValue()); |
|
|
|
|
|
|
|
self.textIconCombo.hideView(); |
|
|
|
|
|
|
|
self.fireEvent(BI.IconTextValueCombo.EVENT_CHANGE, arguments); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
this.popup.on(BI.Controller.EVENT_CHANGE, function () { |
|
|
|
|
|
|
|
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
this.textIconCombo = BI.createWidget({ |
|
|
|
|
|
|
|
type: "bi.combo", |
|
|
|
|
|
|
|
element: this, |
|
|
|
|
|
|
|
adjustLength: 2, |
|
|
|
|
|
|
|
el: this.trigger, |
|
|
|
|
|
|
|
popup: { |
|
|
|
|
|
|
|
el: this.popup, |
|
|
|
|
|
|
|
maxHeight: 300 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setValue: function (v) { |
|
|
|
|
|
|
|
this.textIconCombo.setValue(v); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
getValue: function () { |
|
|
|
|
|
|
|
return this.textIconCombo.getValue(); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
populate: function (items) { |
|
|
|
|
|
|
|
this.options.items = items; |
|
|
|
|
|
|
|
this.textIconCombo.populate(items); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
BI.IconTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE"; |
|
|
|
|
|
|
|
BI.shortcut("bi.icon_text_value_combo", BI.IconTextValueCombo);/** |
|
|
|
|
|
|
|
* Created by Windy on 2017/12/12. |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { |
|
|
|
|
|
|
|
_defaultConfig: function () { |
|
|
|
|
|
|
|
return BI.extend(BI.IconTextValueComboPopup.superclass._defaultConfig.apply(this, arguments), { |
|
|
|
|
|
|
|
baseCls: "bi-icon-text-icon-popup" |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_init: function () { |
|
|
|
|
|
|
|
BI.IconTextValueComboPopup.superclass._init.apply(this, arguments); |
|
|
|
|
|
|
|
var o = this.options, self = this; |
|
|
|
|
|
|
|
this.popup = BI.createWidget({ |
|
|
|
|
|
|
|
type: "bi.button_group", |
|
|
|
|
|
|
|
items: BI.createItems(o.items, { |
|
|
|
|
|
|
|
type: "bi.single_select_icon_text_item", |
|
|
|
|
|
|
|
height: 30 |
|
|
|
|
|
|
|
}), |
|
|
|
|
|
|
|
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, |
|
|
|
|
|
|
|
layouts: [{ |
|
|
|
|
|
|
|
type: "bi.vertical" |
|
|
|
|
|
|
|
}] |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) { |
|
|
|
|
|
|
|
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); |
|
|
|
|
|
|
|
if (type === BI.Events.CLICK) { |
|
|
|
|
|
|
|
self.fireEvent(BI.IconTextValueComboPopup.EVENT_CHANGE, val, obj); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BI.createWidget({ |
|
|
|
|
|
|
|
type: "bi.vertical", |
|
|
|
|
|
|
|
element: this, |
|
|
|
|
|
|
|
items: [this.popup] |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
populate: function (items) { |
|
|
|
|
|
|
|
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); |
|
|
|
|
|
|
|
items = BI.createItems(items, { |
|
|
|
|
|
|
|
type: "bi.single_select_icon_text_item", |
|
|
|
|
|
|
|
height: 30 |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
this.popup.populate(items); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
getValue: function () { |
|
|
|
|
|
|
|
return this.popup.getValue(); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setValue: function (v) { |
|
|
|
|
|
|
|
this.popup.setValue(v); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; |
|
|
|
|
|
|
|
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** |
|
|
|
* 单选combo |
|
|
|
* 单选combo |
|
|
|
* |
|
|
|
* |
|
|
|
* @class BI.StaticCombo |
|
|
|
* @class BI.StaticCombo |
|
|
|
@ -74995,6 +75139,60 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, { |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
BI.shortcut("bi.icon_text_trigger", BI.IconTextTrigger);/** |
|
|
|
BI.shortcut("bi.icon_text_trigger", BI.IconTextTrigger);/** |
|
|
|
|
|
|
|
* Created by Windy on 2017/12/12. |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_defaultConfig: function () { |
|
|
|
|
|
|
|
return BI.extend(BI.SelectIconTextTrigger.superclass._defaultConfig.apply(this, arguments), { |
|
|
|
|
|
|
|
baseCls: "bi-select-text-trigger bi-border", |
|
|
|
|
|
|
|
height: 24 |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_init: function () { |
|
|
|
|
|
|
|
this.options.height -= 2; |
|
|
|
|
|
|
|
BI.SelectIconTextTrigger.superclass._init.apply(this, arguments); |
|
|
|
|
|
|
|
var self = this, o = this.options; |
|
|
|
|
|
|
|
this.trigger = BI.createWidget({ |
|
|
|
|
|
|
|
type: "bi.icon_text_trigger", |
|
|
|
|
|
|
|
element: this, |
|
|
|
|
|
|
|
height: o.height |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
if (BI.isKey(o.text)) { |
|
|
|
|
|
|
|
this.setValue(o.text); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setValue: function (vals) { |
|
|
|
|
|
|
|
var o = this.options; |
|
|
|
|
|
|
|
vals = BI.isArray(vals) ? vals : [vals]; |
|
|
|
|
|
|
|
var result; |
|
|
|
|
|
|
|
var items = BI.Tree.transformToArrayFormat(this.options.items); |
|
|
|
|
|
|
|
BI.any(items, function (i, item) { |
|
|
|
|
|
|
|
if (BI.deepContains(vals, item.value)) { |
|
|
|
|
|
|
|
result = { |
|
|
|
|
|
|
|
text: item.text || item.value, |
|
|
|
|
|
|
|
iconClass: item.iconClass |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (BI.isNotNull(result)) { |
|
|
|
|
|
|
|
this.trigger.setText(result.text); |
|
|
|
|
|
|
|
this.trigger.setIcon(result.iconClass); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
this.trigger.setText(o.text); |
|
|
|
|
|
|
|
this.trigger.setIcon(""); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
populate: function (items) { |
|
|
|
|
|
|
|
this.options.items = items; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
BI.shortcut("bi.select_icon_text_trigger", BI.SelectIconTextTrigger);/** |
|
|
|
* 文字trigger |
|
|
|
* 文字trigger |
|
|
|
* |
|
|
|
* |
|
|
|
* Created by GUY on 2015/9/15. |
|
|
|
* Created by GUY on 2015/9/15. |
|
|
|
@ -77164,8 +77362,8 @@ BI.DatePicker = BI.inherit(BI.Widget, { |
|
|
|
_init: function () { |
|
|
|
_init: function () { |
|
|
|
BI.DatePicker.superclass._init.apply(this, arguments); |
|
|
|
BI.DatePicker.superclass._init.apply(this, arguments); |
|
|
|
var self = this, o = this.options; |
|
|
|
var self = this, o = this.options; |
|
|
|
this._year = new Date().getFullYear(); |
|
|
|
this._year = Date.getDate().getFullYear(); |
|
|
|
this._month = new Date().getMonth(); |
|
|
|
this._month = Date.getDate().getMonth(); |
|
|
|
this.left = BI.createWidget({ |
|
|
|
this.left = BI.createWidget({ |
|
|
|
type: "bi.icon_button", |
|
|
|
type: "bi.icon_button", |
|
|
|
cls: "pre-page-h-font", |
|
|
|
cls: "pre-page-h-font", |
|
|
|
@ -77329,7 +77527,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { |
|
|
|
BI.DateCalendarPopup.superclass._init.apply(this, arguments); |
|
|
|
BI.DateCalendarPopup.superclass._init.apply(this, arguments); |
|
|
|
var self = this, |
|
|
|
var self = this, |
|
|
|
o = this.options; |
|
|
|
o = this.options; |
|
|
|
this.today = new Date(); |
|
|
|
this.today = Date.getDate(); |
|
|
|
this._year = this.today.getFullYear(); |
|
|
|
this._year = this.today.getFullYear(); |
|
|
|
this._month = this.today.getMonth(); |
|
|
|
this._month = this.today.getMonth(); |
|
|
|
this._day = this.today.getDate(); |
|
|
|
this._day = this.today.getDate(); |
|
|
|
@ -77651,7 +77849,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge |
|
|
|
|
|
|
|
|
|
|
|
setValue: function (v) { |
|
|
|
setValue: function (v) { |
|
|
|
var type, value, self = this; |
|
|
|
var type, value, self = this; |
|
|
|
var date = new Date(); |
|
|
|
var date = Date.getDate(); |
|
|
|
this.store_value = v; |
|
|
|
this.store_value = v; |
|
|
|
if (BI.isNotNull(v)) { |
|
|
|
if (BI.isNotNull(v)) { |
|
|
|
type = v.type || BI.DateTrigger.MULTI_DATE_CALENDAR; value = v.value; |
|
|
|
type = v.type || BI.DateTrigger.MULTI_DATE_CALENDAR; value = v.value; |
|
|
|
@ -77668,62 +77866,62 @@ 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 = new Date((date.getFullYear() - 1 * value), date.getMonth(), date.getDate()); |
|
|
|
date = Date.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 = new Date((date.getFullYear() + 1 * value), date.getMonth(), date.getDate()); |
|
|
|
date = Date.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: |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_BEGIN]; |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_BEGIN]; |
|
|
|
date = new Date(date.getFullYear(), 0, 1); |
|
|
|
date = Date.getDate(date.getFullYear(), 0, 1); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_YEAR_END: |
|
|
|
case BI.DateTrigger.MULTI_DATE_YEAR_END: |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_END]; |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_YEAR_END]; |
|
|
|
date = new Date(date.getFullYear(), 11, 31); |
|
|
|
date = Date.getDate(date.getFullYear(), 11, 31); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_QUARTER_PREV: |
|
|
|
case BI.DateTrigger.MULTI_DATE_QUARTER_PREV: |
|
|
|
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_QUARTER_PREV]; |
|
|
|
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_QUARTER_PREV]; |
|
|
|
date = new Date().getBeforeMulQuarter(value); |
|
|
|
date = Date.getDate().getBeforeMulQuarter(value); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_QUARTER_AFTER: |
|
|
|
case BI.DateTrigger.MULTI_DATE_QUARTER_AFTER: |
|
|
|
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_QUARTER_AFTER]; |
|
|
|
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_QUARTER_AFTER]; |
|
|
|
date = new Date().getAfterMulQuarter(value); |
|
|
|
date = Date.getDate().getAfterMulQuarter(value); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_QUARTER_BEGIN: |
|
|
|
case BI.DateTrigger.MULTI_DATE_QUARTER_BEGIN: |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_QUARTER_BEGIN]; |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_QUARTER_BEGIN]; |
|
|
|
date = new Date().getQuarterStartDate(); |
|
|
|
date = Date.getDate().getQuarterStartDate(); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_QUARTER_END: |
|
|
|
case BI.DateTrigger.MULTI_DATE_QUARTER_END: |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_QUARTER_END]; |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_QUARTER_END]; |
|
|
|
date = new Date().getQuarterEndDate(); |
|
|
|
date = Date.getDate().getQuarterEndDate(); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_MONTH_PREV: |
|
|
|
case BI.DateTrigger.MULTI_DATE_MONTH_PREV: |
|
|
|
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_MONTH_PREV]; |
|
|
|
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_MONTH_PREV]; |
|
|
|
date = new Date().getBeforeMultiMonth(value); |
|
|
|
date = Date.getDate().getBeforeMultiMonth(value); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_MONTH_AFTER: |
|
|
|
case BI.DateTrigger.MULTI_DATE_MONTH_AFTER: |
|
|
|
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_MONTH_AFTER]; |
|
|
|
var text = value + BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_MONTH_AFTER]; |
|
|
|
date = new Date().getAfterMultiMonth(value); |
|
|
|
date = Date.getDate().getAfterMultiMonth(value); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_MONTH_BEGIN: |
|
|
|
case BI.DateTrigger.MULTI_DATE_MONTH_BEGIN: |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_MONTH_BEGIN]; |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_MONTH_BEGIN]; |
|
|
|
date = new Date(date.getFullYear(), date.getMonth(), 1); |
|
|
|
date = Date.getDate(date.getFullYear(), date.getMonth(), 1); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_MONTH_END: |
|
|
|
case BI.DateTrigger.MULTI_DATE_MONTH_END: |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_MONTH_END]; |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_MONTH_END]; |
|
|
|
date = new Date(date.getFullYear(), date.getMonth(), (date.getLastDateOfMonth()).getDate()); |
|
|
|
date = Date.getDate(date.getFullYear(), date.getMonth(), (date.getLastDateOfMonth()).getDate()); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_WEEK_PREV: |
|
|
|
case BI.DateTrigger.MULTI_DATE_WEEK_PREV: |
|
|
|
@ -77748,7 +77946,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge |
|
|
|
break; |
|
|
|
break; |
|
|
|
case BI.DateTrigger.MULTI_DATE_DAY_TODAY: |
|
|
|
case BI.DateTrigger.MULTI_DATE_DAY_TODAY: |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_DAY_TODAY]; |
|
|
|
var text = BI.DateTrigger.MULTI_DATE_SEGMENT_NUM[BI.DateTrigger.MULTI_DATE_DAY_TODAY]; |
|
|
|
date = new Date(); |
|
|
|
date = Date.getDate(); |
|
|
|
_setInnerValue(date, text); |
|
|
|
_setInnerValue(date, text); |
|
|
|
break; |
|
|
|
break; |
|
|
|
default: |
|
|
|
default: |
|
|
|
@ -77849,7 +78047,7 @@ BI.DatePaneWidget = BI.inherit(BI.Widget, { |
|
|
|
BI.DatePaneWidget.superclass._init.apply(this, arguments); |
|
|
|
BI.DatePaneWidget.superclass._init.apply(this, arguments); |
|
|
|
var self = this, o = this.options; |
|
|
|
var self = this, o = this.options; |
|
|
|
|
|
|
|
|
|
|
|
this.today = new Date(); |
|
|
|
this.today = Date.getDate(); |
|
|
|
this._year = this.today.getFullYear(); |
|
|
|
this._year = this.today.getFullYear(); |
|
|
|
this._month = this.today.getMonth(); |
|
|
|
this._month = this.today.getMonth(); |
|
|
|
|
|
|
|
|
|
|
|
@ -77913,7 +78111,7 @@ BI.DatePaneWidget = BI.inherit(BI.Widget, { |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
_getNewCurrentDate: function () { |
|
|
|
_getNewCurrentDate: function () { |
|
|
|
var today = new Date(); |
|
|
|
var today = Date.getDate(); |
|
|
|
return { |
|
|
|
return { |
|
|
|
year: today.getFullYear(), |
|
|
|
year: today.getFullYear(), |
|
|
|
month: today.getMonth() |
|
|
|
month: today.getMonth() |
|
|
|
@ -77975,7 +78173,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, { |
|
|
|
_init: function () { |
|
|
|
_init: function () { |
|
|
|
BI.DateTimeCombo.superclass._init.apply(this, arguments); |
|
|
|
BI.DateTimeCombo.superclass._init.apply(this, arguments); |
|
|
|
var self = this, opts = this.options; |
|
|
|
var self = this, opts = this.options; |
|
|
|
var date = new Date(); |
|
|
|
var date = Date.getDate(); |
|
|
|
this.storeValue = { |
|
|
|
this.storeValue = { |
|
|
|
year: date.getFullYear(), |
|
|
|
year: date.getFullYear(), |
|
|
|
month: date.getMonth(), |
|
|
|
month: date.getMonth(), |
|
|
|
@ -78192,7 +78390,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { |
|
|
|
}] |
|
|
|
}] |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
var date = new Date(); |
|
|
|
var date = Date.getDate(); |
|
|
|
this.dateCombo.setValue({ |
|
|
|
this.dateCombo.setValue({ |
|
|
|
year: date.getFullYear(), |
|
|
|
year: date.getFullYear(), |
|
|
|
month: date.getMonth(), |
|
|
|
month: date.getMonth(), |
|
|
|
@ -78224,7 +78422,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { |
|
|
|
setValue: function (v) { |
|
|
|
setValue: function (v) { |
|
|
|
var value = v, date; |
|
|
|
var value = v, date; |
|
|
|
if (BI.isNull(value)) { |
|
|
|
if (BI.isNull(value)) { |
|
|
|
date = new Date(); |
|
|
|
date = Date.getDate(); |
|
|
|
this.dateCombo.setValue({ |
|
|
|
this.dateCombo.setValue({ |
|
|
|
year: date.getFullYear(), |
|
|
|
year: date.getFullYear(), |
|
|
|
month: date.getMonth(), |
|
|
|
month: date.getMonth(), |
|
|
|
@ -78414,10 +78612,10 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, { |
|
|
|
var self = this; |
|
|
|
var self = this; |
|
|
|
var value = v, dateStr; |
|
|
|
var value = v, dateStr; |
|
|
|
if(BI.isNull(value)){ |
|
|
|
if(BI.isNull(value)){ |
|
|
|
value = new Date(); |
|
|
|
value = Date.getDate(); |
|
|
|
dateStr = value.print("%Y-%X-%d %H:%M:%S"); |
|
|
|
dateStr = value.print("%Y-%X-%d %H:%M:%S"); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
var date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second); |
|
|
|
var date = Date.getDate(value.year,value.month,value.day,value.hour,value.minute,value.second); |
|
|
|
dateStr = date.print("%Y-%X-%d %H:%M:%S"); |
|
|
|
dateStr = date.print("%Y-%X-%d %H:%M:%S"); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
@ -81129,14 +81327,19 @@ BI.IntervalSlider = BI.inherit(BI.Widget, { |
|
|
|
_checkValidation: function (v) { |
|
|
|
_checkValidation: function (v) { |
|
|
|
var o = this.options; |
|
|
|
var o = this.options; |
|
|
|
var valid = false; |
|
|
|
var valid = false; |
|
|
|
|
|
|
|
//像90.这样的既不属于整数又不属于小数，是不合法的值
|
|
|
|
|
|
|
|
var dotText = (v + "").split(".")[1]; |
|
|
|
|
|
|
|
if (BI.isEmptyString(dotText)) { |
|
|
|
|
|
|
|
}else{ |
|
|
|
if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) { |
|
|
|
if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) { |
|
|
|
if(o.digit === false){ |
|
|
|
if(o.digit === false){ |
|
|
|
valid = true; |
|
|
|
valid = true; |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
var dotText = (v + "").split(".")[1] || ""; |
|
|
|
dotText = dotText || ""; |
|
|
|
valid = (dotText.length === o.digit); |
|
|
|
valid = (dotText.length === o.digit); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return valid; |
|
|
|
return valid; |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
@ -81959,39 +82162,39 @@ BI.MultiDateCard = BI.inherit(BI.Widget, { |
|
|
|
var type = valueObject.type, value = valueObject.value; |
|
|
|
var type = valueObject.type, value = valueObject.value; |
|
|
|
switch (type) { |
|
|
|
switch (type) { |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_DAY_PREV: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_DAY_PREV: |
|
|
|
return new Date().getOffsetDate(-1 * value); |
|
|
|
return Date.getDate().getOffsetDate(-1 * value); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_DAY_AFTER: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_DAY_AFTER: |
|
|
|
return new Date().getOffsetDate(value); |
|
|
|
return Date.getDate().getOffsetDate(value); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_DAY_TODAY: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_DAY_TODAY: |
|
|
|
return new Date(); |
|
|
|
return Date.getDate(); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_MONTH_PREV: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_MONTH_PREV: |
|
|
|
return new Date().getBeforeMultiMonth(value); |
|
|
|
return Date.getDate().getBeforeMultiMonth(value); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_MONTH_AFTER: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_MONTH_AFTER: |
|
|
|
return new Date().getAfterMultiMonth(value); |
|
|
|
return Date.getDate().getAfterMultiMonth(value); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_MONTH_BEGIN: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_MONTH_BEGIN: |
|
|
|
return new Date(new Date().getFullYear(), new Date().getMonth(), 1); |
|
|
|
return Date.getDate(Date.getDate().getFullYear(), Date.getDate().getMonth(), 1); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_MONTH_END: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_MONTH_END: |
|
|
|
return new Date(new Date().getFullYear(), new Date().getMonth(), (new Date().getLastDateOfMonth()).getDate()); |
|
|
|
return Date.getDate(Date.getDate().getFullYear(), Date.getDate().getMonth(), (Date.getDate().getLastDateOfMonth()).getDate()); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_QUARTER_PREV: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_QUARTER_PREV: |
|
|
|
return new Date().getBeforeMulQuarter(value); |
|
|
|
return Date.getDate().getBeforeMulQuarter(value); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_QUARTER_AFTER: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_QUARTER_AFTER: |
|
|
|
return new Date().getAfterMulQuarter(value); |
|
|
|
return Date.getDate().getAfterMulQuarter(value); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_QUARTER_BEGIN: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_QUARTER_BEGIN: |
|
|
|
return new Date().getQuarterStartDate(); |
|
|
|
return Date.getDate().getQuarterStartDate(); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_QUARTER_END: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_QUARTER_END: |
|
|
|
return new Date().getQuarterEndDate(); |
|
|
|
return Date.getDate().getQuarterEndDate(); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_WEEK_PREV: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_WEEK_PREV: |
|
|
|
return new Date().getOffsetDate(-7 * value); |
|
|
|
return Date.getDate().getOffsetDate(-7 * value); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_WEEK_AFTER: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_WEEK_AFTER: |
|
|
|
return new Date().getOffsetDate(7 * value); |
|
|
|
return Date.getDate().getOffsetDate(7 * value); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_YEAR_PREV: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_YEAR_PREV: |
|
|
|
return new Date((new Date().getFullYear() - 1 * value), new Date().getMonth(), new Date().getDate()); |
|
|
|
return Date.getDate((Date.getDate().getFullYear() - 1 * value), Date.getDate().getMonth(), Date.getDate().getDate()); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_YEAR_AFTER: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_YEAR_AFTER: |
|
|
|
return new Date((new Date().getFullYear() + 1 * value), new Date().getMonth(), new Date().getDate()); |
|
|
|
return Date.getDate((Date.getDate().getFullYear() + 1 * value), Date.getDate().getMonth(), Date.getDate().getDate()); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_YEAR_BEGIN: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_YEAR_BEGIN: |
|
|
|
return new Date(new Date().getFullYear(), 0, 1); |
|
|
|
return Date.getDate(Date.getDate().getFullYear(), 0, 1); |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_YEAR_END: |
|
|
|
case BI.MultiDateCombo.DATE_TYPE.MULTI_DATE_YEAR_END: |
|
|
|
return new Date(new Date().getFullYear(), 11, 31); |
|
|
|
return Date.getDate(Date.getDate().getFullYear(), 11, 31); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
@ -82020,7 +82223,7 @@ BI.MultiDateCombo = BI.inherit(BI.Single, { |
|
|
|
BI.MultiDateCombo.superclass._init.apply(this, arguments); |
|
|
|
BI.MultiDateCombo.superclass._init.apply(this, arguments); |
|
|
|
var self = this, opts = this.options; |
|
|
|
var self = this, opts = this.options; |
|
|
|
this.storeTriggerValue = ""; |
|
|
|
this.storeTriggerValue = ""; |
|
|
|
var date = new Date(); |
|
|
|
var date = Date.getDate(); |
|
|
|
this.storeValue = null; |
|
|
|
this.storeValue = null; |
|
|
|
this.trigger = BI.createWidget({ |
|
|
|
this.trigger = BI.createWidget({ |
|
|
|
type: 'bi.date_trigger', |
|
|
|
type: 'bi.date_trigger', |
|
|
|
@ -82087,7 +82290,7 @@ BI.MultiDateCombo = BI.inherit(BI.Single, { |
|
|
|
self.fireEvent(BI.MultiDateCombo.EVENT_CONFIRM); |
|
|
|
self.fireEvent(BI.MultiDateCombo.EVENT_CONFIRM); |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.popup.on(BI.MultiDatePopup.BUTTON_lABEL_EVENT_CHANGE, function () { |
|
|
|
this.popup.on(BI.MultiDatePopup.BUTTON_lABEL_EVENT_CHANGE, function () { |
|
|
|
var date = new Date(); |
|
|
|
var date = Date.getDate(); |
|
|
|
self.setValue({ |
|
|
|
self.setValue({ |
|
|
|
year: date.getFullYear(), |
|
|
|
year: date.getFullYear(), |
|
|
|
month: date.getMonth(), |
|
|
|
month: date.getMonth(), |
|
|
|
@ -82584,7 +82787,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, { |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
_checkValueValid: function (value) { |
|
|
|
_checkValueValid: function (value) { |
|
|
|
return BI.isNotNull(value) && BI.isNotEmptyObject(value) && BI.isNotEmptyString(value); |
|
|
|
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value); |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
setValue: function (v) { |
|
|
|
setValue: function (v) { |
|
|
|
@ -82642,8 +82845,8 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, { |
|
|
|
self._setInnerValue(this.day); |
|
|
|
self._setInnerValue(this.day); |
|
|
|
break; |
|
|
|
break; |
|
|
|
default: |
|
|
|
default: |
|
|
|
if (!this._checkValueValid(value)) { |
|
|
|
if (this._checkValueValid(value)) { |
|
|
|
var date = new Date(); |
|
|
|
var date = Date.getDate(); |
|
|
|
this.dateTab.setSelect(BI.MultiDateCombo.MULTI_DATE_YMD_CARD); |
|
|
|
this.dateTab.setSelect(BI.MultiDateCombo.MULTI_DATE_YMD_CARD); |
|
|
|
this.ymd.setValue({ |
|
|
|
this.ymd.setValue({ |
|
|
|
year: date.getFullYear(), |
|
|
|
year: date.getFullYear(), |
|
|
|
@ -93836,7 +94039,7 @@ BI.YearPopup = BI.inherit(BI.Widget, { |
|
|
|
BI.YearPopup.superclass._init.apply(this, arguments); |
|
|
|
BI.YearPopup.superclass._init.apply(this, arguments); |
|
|
|
var self = this; |
|
|
|
var self = this; |
|
|
|
|
|
|
|
|
|
|
|
this.selectedYear = this._year = new Date().getFullYear(); |
|
|
|
this.selectedYear = this._year = Date.getDate().getFullYear(); |
|
|
|
|
|
|
|
|
|
|
|
var backBtn = BI.createWidget({ |
|
|
|
var backBtn = BI.createWidget({ |
|
|
|
type: "bi.icon_button", |
|
|
|
type: "bi.icon_button", |
|
|
|
@ -93890,7 +94093,7 @@ BI.YearPopup = BI.inherit(BI.Widget, { |
|
|
|
setValue: function (v) { |
|
|
|
setValue: function (v) { |
|
|
|
var o = this.options; |
|
|
|
var o = this.options; |
|
|
|
if (Date.checkVoid(v, 1, 1, o.min, o.max)[0]) { |
|
|
|
if (Date.checkVoid(v, 1, 1, o.min, o.max)[0]) { |
|
|
|
v = new Date().getFullYear(); |
|
|
|
v = Date.getDate().getFullYear(); |
|
|
|
this.selectedYear = ""; |
|
|
|
this.selectedYear = ""; |
|
|
|
this.navigation.setSelect(BI.YearCalendar.getPageByYear(v)); |
|
|
|
this.navigation.setSelect(BI.YearCalendar.getPageByYear(v)); |
|
|
|
this.navigation.setValue(""); |
|
|
|
this.navigation.setValue(""); |
|
|
|
|
guy
7 years ago