@ -14859,8 +14859,9 @@ BI.Cache = {
// 判断是否设置过期时间
// 判断是否设置过期时间
if ( expiresHours && expiresHours > 0 ) {
if ( expiresHours && expiresHours > 0 ) {
var date = new Date ( ) ;
var date = new Date ( ) ;
date . setTime ( BI . getTime ( ) + expiresHours * 3600 * 1000 ) ;
// expires是标准GMT格式时间,应该使用时间戳作为起始时间
cookieString = cookieString + "; expires=" + date . toGMTString ( ) ;
date . setTime ( date . getTime ( ) + expiresHours * 3600 * 1000 ) ;
cookieString = cookieString + "; expires=" + date . toUTCString ( ) ;
}
}
if ( path ) {
if ( path ) {
cookieString = cookieString + "; path=" + path ;
cookieString = cookieString + "; path=" + path ;
@ -14874,8 +14875,8 @@ BI.Cache = {
} ,
} ,
deleteCookie : function ( name , path ) {
deleteCookie : function ( name , path ) {
var date = new Date ( ) ;
var date = new Date ( ) ;
date . setTime ( BI . getTime ( ) - 10000 ) ;
date . setTime ( date . getTime ( ) - 10000 ) ;
var cookieString = name + "=v; expires=" + date . toGMT String ( ) ;
var cookieString = name + "=v; expires=" + date . toUTC String ( ) ;
if ( path ) {
if ( path ) {
cookieString = cookieString + "; path=" + path ;
cookieString = cookieString + "; path=" + path ;
}
}
@ -32554,7 +32555,10 @@ BI.$.extend(BI.$.Event.prototype, {
textLeft = textLeft . substr ( tidx + keyword . length ) ;
textLeft = textLeft . substr ( tidx + keyword . length ) ;
if ( py != null ) {
if ( py != null ) {
py = py . substr ( tidx + keyword . length ) ;
// 每一组拼音都应该前进,而不是只是当前的
py = BI . map ( py . split ( "\u200b" ) , function ( idx , ps ) {
return ps . slice ( tidx + keyword . length ) ;
} ) . join ( "\u200b" ) ;
}
}
} else if ( pidx != null && pidx >= 0 ) {
} else if ( pidx != null && pidx >= 0 ) {
// BI-56386 这边两个pid / text.length是为了防止截取的首字符串不是完整的,但光这样做还不够,即时错位了,也不能说明就不符合条件
// BI-56386 这边两个pid / text.length是为了防止截取的首字符串不是完整的,但光这样做还不够,即时错位了,也不能说明就不符合条件
@ -64903,6 +64907,7 @@ BI.extend(BI.DynamicDateCard, {
toggle : false ,
toggle : false ,
isNeedAdjustHeight : false ,
isNeedAdjustHeight : false ,
isNeedAdjustWidth : false ,
isNeedAdjustWidth : false ,
destroyWhenHide : true ,
el : {
el : {
type : "bi.dynamic_date_trigger" ,
type : "bi.dynamic_date_trigger" ,
min : opts . minDate ,
min : opts . minDate ,
@ -65047,9 +65052,9 @@ BI.extend(BI.DynamicDateCard, {
listeners : [ {
listeners : [ {
eventName : BI . Combo . EVENT _BEFORE _POPUPVIEW ,
eventName : BI . Combo . EVENT _BEFORE _POPUPVIEW ,
action : function ( ) {
action : function ( ) {
self . popup . setValue ( self . storeValue ) ;
self . popup . setMinDate ( opts . minDate ) ;
self . popup . setMinDate ( opts . minDate ) ;
self . popup . setMaxDate ( opts . maxDate ) ;
self . popup . setMaxDate ( opts . maxDate ) ;
self . popup . setValue ( self . storeValue ) ;
self . fireEvent ( BI . DynamicDateCombo . EVENT _BEFORE _POPUPVIEW ) ;
self . fireEvent ( BI . DynamicDateCombo . EVENT _BEFORE _POPUPVIEW ) ;
}
}
} ]
} ]
@ -65463,16 +65468,16 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
setMinDate : function ( minDate ) {
setMinDate : function ( minDate ) {
if ( this . options . min !== minDate ) {
if ( this . options . min !== minDate ) {
this . options . min = minDate ;
this . ymd . setMinDate ( minDate ) ;
this . ymd . setMinDate ( minDate ) ;
}
}
this . options . min = minDate ;
} ,
} ,
setMaxDate : function ( maxDate ) {
setMaxDate : function ( maxDate ) {
if ( this . options . max !== maxDate ) {
if ( this . options . max !== maxDate ) {
this . options . max = maxDate ;
this . ymd . setMaxDate ( maxDate ) ;
this . ymd . setMaxDate ( maxDate ) ;
}
}
this . options . max = maxDate ;
} ,
} ,
setValue : function ( v ) {
setValue : function ( v ) {
@ -65911,6 +65916,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
items : [ {
items : [ {
el : {
el : {
type : "bi.combo" ,
type : "bi.combo" ,
destroyWhenHide : true ,
container : opts . container ,
container : opts . container ,
ref : function ( ) {
ref : function ( ) {
self . combo = this ;
self . combo = this ;
@ -66067,6 +66073,8 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
eventName : BI . Combo . EVENT _BEFORE _POPUPVIEW ,
eventName : BI . Combo . EVENT _BEFORE _POPUPVIEW ,
action : function ( ) {
action : function ( ) {
self . popup . setValue ( self . storeValue ) ;
self . popup . setValue ( self . storeValue ) ;
self . popup . setMinDate ( opts . minDate ) ;
self . popup . setMaxDate ( opts . maxDate ) ;
self . fireEvent ( BI . DynamicDateTimeCombo . EVENT _BEFORE _POPUPVIEW ) ;
self . fireEvent ( BI . DynamicDateTimeCombo . EVENT _BEFORE _POPUPVIEW ) ;
}
}
} ] ,
} ] ,
@ -66373,16 +66381,16 @@ BI.extend(BI.DynamicDateTimeCombo, {
setMinDate : function ( minDate ) {
setMinDate : function ( minDate ) {
if ( this . options . min !== minDate ) {
if ( this . options . min !== minDate ) {
this . options . min = minDate ;
this . ymd . setMinDate ( minDate ) ;
this . ymd . setMinDate ( minDate ) ;
}
}
this . options . min = minDate ;
} ,
} ,
setMaxDate : function ( maxDate ) {
setMaxDate : function ( maxDate ) {
if ( this . options . max !== maxDate ) {
if ( this . options . max !== maxDate ) {
this . options . max = maxDate ;
this . ymd . setMaxDate ( maxDate ) ;
this . ymd . setMaxDate ( maxDate ) ;
}
}
this . options . max = maxDate ;
} ,
} ,
setValue : function ( v ) {
setValue : function ( v ) {
@ -67777,11 +67785,15 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
valueTwo = BI . parseFloat ( valueTwo ) ;
valueTwo = BI . parseFloat ( valueTwo ) ;
if ( ( oldValueOne <= oldValueTwo && valueOne > valueTwo ) || ( oldValueOne >= oldValueTwo && valueOne < valueTwo ) ) {
if ( ( oldValueOne <= oldValueTwo && valueOne > valueTwo ) || ( oldValueOne >= oldValueTwo && valueOne < valueTwo ) ) {
var isSliderOneLeft = BI . parseFloat ( this . sliderOne . element [ 0 ] . style . left ) < BI . parseFloat ( this . sliderTwo . element [ 0 ] . style . left ) ;
var isSliderOneLeft = BI . parseFloat ( this . sliderOne . element [ 0 ] . style . left ) < BI . parseFloat ( this . sliderTwo . element [ 0 ] . style . left ) ;
this . labelOne . element . css ( { left : isSliderOneLeft ? "0%" : "100%" } ) ;
this . _resetLabelPosition ( ! isSliderOneLeft ) ;
this . labelTwo . element . css ( { left : isSliderOneLeft ? "100%" : "0%" } ) ;
}
}
} ,
} ,
_resetLabelPosition : function ( needReverse ) {
this . labelOne . element . css ( { left : needReverse ? "100%" : "0%" } ) ;
this . labelTwo . element . css ( { left : needReverse ? "0%" : "100%" } ) ;
} ,
_setSliderOnePosition : function ( percent ) {
_setSliderOnePosition : function ( percent ) {
this . sliderOne . element . css ( { left : percent + "%" } ) ;
this . sliderOne . element . css ( { left : percent + "%" } ) ;
} ,
} ,
@ -67924,8 +67936,8 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
var o = this . options ;
var o = this . options ;
var valueOne = BI . parseFloat ( v . min ) ;
var valueOne = BI . parseFloat ( v . min ) ;
var valueTwo = BI . parseFloat ( v . max ) ;
var valueTwo = BI . parseFloat ( v . max ) ;
valueOne = o . digit === false ? valueOne : valueOne . toFixed ( o . digit ) ;
valueOne = o . digit === false ? valueOne : BI . parseFloat ( valueOne . toFixed ( o . digit ) ) ;
valueTwo = o . digit === false ? valueTwo : valueTwo . toFixed ( o . digit ) ;
valueTwo = o . digit === false ? valueTwo : BI . parseFloat ( valueTwo . toFixed ( o . digit ) ) ;
if ( ! isNaN ( valueOne ) && ! isNaN ( valueTwo ) ) {
if ( ! isNaN ( valueOne ) && ! isNaN ( valueTwo ) ) {
if ( this . _checkValidation ( valueOne ) ) {
if ( this . _checkValidation ( valueOne ) ) {
this . valueOne = ( this . valueOne <= this . valueTwo ? valueOne : valueTwo ) ;
this . valueOne = ( this . valueOne <= this . valueTwo ? valueOne : valueTwo ) ;
@ -67966,6 +67978,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
this . labelTwo . setValue ( this . max ) ;
this . labelTwo . setValue ( this . max ) ;
this . _setAllPosition ( 0 , 100 ) ;
this . _setAllPosition ( 0 , 100 ) ;
}
}
this . _resetLabelPosition ( ) ;
}
}
}
}
} ) ;
} ) ;
@ -71607,7 +71620,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.combo" ,
type : "bi.combo" ,
toggle : false ,
toggle : ! o . allowEdit ,
container : o . container ,
container : o . container ,
el : this . trigger ,
el : this . trigger ,
adjustLength : 1 ,
adjustLength : 1 ,
@ -72042,7 +72055,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.combo" ,
type : "bi.combo" ,
toggle : false ,
toggle : ! o . allowEdit ,
el : this . trigger ,
el : this . trigger ,
adjustLength : 1 ,
adjustLength : 1 ,
container : o . container ,
container : o . container ,
@ -74442,6 +74455,7 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
type : "bi.multi_select_editor" ,
type : "bi.multi_select_editor" ,
height : o . height ,
height : o . height ,
text : o . text ,
text : o . text ,
watermark : o . watermark ,
listeners : [ {
listeners : [ {
eventName : BI . MultiSelectEditor . EVENT _FOCUS ,
eventName : BI . MultiSelectEditor . EVENT _FOCUS ,
action : function ( ) {
action : function ( ) {
@ -76084,7 +76098,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
baseCls : "bi-multi-tree-combo" ,
baseCls : "bi-multi-tree-combo" ,
itemsCreator : BI . emptyFn ,
itemsCreator : BI . emptyFn ,
valueFormatter : BI . emptyFn ,
valueFormatter : BI . emptyFn ,
height : 24
height : 24 ,
allowEdit : true
} ) ;
} ) ;
} ,
} ,
@ -76100,6 +76115,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this . trigger = BI . createWidget ( {
this . trigger = BI . createWidget ( {
type : "bi.multi_select_trigger" ,
type : "bi.multi_select_trigger" ,
allowEdit : o . allowEdit ,
height : o . height ,
height : o . height ,
valueFormatter : o . valueFormatter ,
valueFormatter : o . valueFormatter ,
text : o . text ,
text : o . text ,
@ -76117,7 +76133,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.combo" ,
type : "bi.combo" ,
toggle : false ,
toggle : ! o . allowEdit ,
container : o . container ,
container : o . container ,
el : this . trigger ,
el : this . trigger ,
adjustLength : 1 ,
adjustLength : 1 ,
@ -76468,7 +76484,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.combo" ,
type : "bi.combo" ,
toggle : false ,
toggle : ! o . allowEdit ,
container : o . container ,
container : o . container ,
el : this . trigger ,
el : this . trigger ,
adjustLength : 1 ,
adjustLength : 1 ,
@ -76835,7 +76851,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.combo" ,
type : "bi.combo" ,
toggle : false ,
toggle : ! o . allowEdit ,
container : o . container ,
container : o . container ,
el : this . trigger ,
el : this . trigger ,
adjustLength : 1 ,
adjustLength : 1 ,
@ -77508,6 +77524,8 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, {
this . editor = BI . createWidget ( {
this . editor = BI . createWidget ( {
type : "bi.multi_select_editor" ,
type : "bi.multi_select_editor" ,
height : o . height ,
height : o . height ,
text : o . text ,
watermark : o . watermark ,
el : {
el : {
type : "bi.simple_state_editor" ,
type : "bi.simple_state_editor" ,
height : o . height
height : o . height
@ -84431,10 +84449,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
}
}
} ) ;
} ) ;
combo . on ( BI . DynamicDateCombo . EVENT _BEFORE _POPUPVIEW , function ( ) {
// combo.on(BI.DynamicDateCombo.EVENT_BEFORE_POPUPVIEW, function () {
self . left . hidePopupView ( ) ;
// self.left.hidePopupView();
self . right . hidePopupView ( ) ;
// self.right.hidePopupView();
} ) ;
// });
combo . on ( BI . DynamicDateCombo . EVENT _CONFIRM , function ( ) {
combo . on ( BI . DynamicDateCombo . EVENT _CONFIRM , function ( ) {
BI . Bubbles . hide ( "error" ) ;
BI . Bubbles . hide ( "error" ) ;
@ -84611,10 +84629,11 @@ BI.TimeInterval = BI.inherit(BI.Single, {
}
}
} ) ;
} ) ;
combo . on ( BI . DynamicDateTimeCombo . EVENT _BEFORE _POPUPVIEW , function ( ) {
// 不知道干啥的,先注释掉
self . left . hidePopupView ( ) ;
// combo.on(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW, function () {
self . right . hidePopupView ( ) ;
// self.left.hidePopupView();
} ) ;
// self.right.hidePopupView();
// });
combo . on ( BI . DynamicDateTimeCombo . EVENT _CONFIRM , function ( ) {
combo . on ( BI . DynamicDateTimeCombo . EVENT _CONFIRM , function ( ) {
BI . Bubbles . hide ( "error" ) ;
BI . Bubbles . hide ( "error" ) ;
@ -85749,18 +85768,18 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
setMinDate : function ( minDate ) {
setMinDate : function ( minDate ) {
if ( this . options . min !== minDate ) {
if ( this . options . min !== minDate ) {
this . options . min = minDate ;
this . yearPicker . setMinDate ( minDate ) ;
this . yearPicker . setMinDate ( minDate ) ;
this . _checkMonthStatus ( this . selectedYear ) ;
this . _checkMonthStatus ( this . selectedYear ) ;
}
}
this . options . min = minDate ;
} ,
} ,
setMaxDate : function ( maxDate ) {
setMaxDate : function ( maxDate ) {
if ( this . options . max !== maxDate ) {
if ( this . options . max !== maxDate ) {
this . options . max = maxDate ;
this . yearPicker . setMaxDate ( maxDate ) ;
this . yearPicker . setMaxDate ( maxDate ) ;
this . _checkMonthStatus ( this . selectedYear ) ;
this . _checkMonthStatus ( this . selectedYear ) ;
}
}
this . options . max = maxDate ;
} ,
} ,
getValue : function ( ) {
getValue : function ( ) {
@ -86152,16 +86171,16 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
setMinDate : function ( minDate ) {
setMinDate : function ( minDate ) {
if ( this . options . min !== minDate ) {
if ( this . options . min !== minDate ) {
this . options . min = minDate ;
this . year . setMinDate ( minDate ) ;
this . year . setMinDate ( minDate ) ;
}
}
this . options . min = minDate ;
} ,
} ,
setMaxDate : function ( maxDate ) {
setMaxDate : function ( maxDate ) {
if ( this . options . max !== maxDate ) {
if ( this . options . max !== maxDate ) {
this . options . max = maxDate ;
this . year . setMaxDate ( maxDate ) ;
this . year . setMaxDate ( maxDate ) ;
}
}
this . options . max = maxDate ;
} ,
} ,
setValue : function ( v ) {
setValue : function ( v ) {
@ -88886,6 +88905,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
}
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.multi_tree_insert_combo" ,
type : "bi.multi_tree_insert_combo" ,
allowEdit : o . allowEdit ,
text : o . text ,
text : o . text ,
value : o . value ,
value : o . value ,
watermark : o . watermark ,
watermark : o . watermark ,
@ -88976,6 +88996,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.multi_tree_combo" ,
type : "bi.multi_tree_combo" ,
text : o . text ,
text : o . text ,
allowEdit : o . allowEdit ,
value : o . value ,
value : o . value ,
watermark : o . watermark ,
watermark : o . watermark ,
element : this ,
element : this ,
@ -89206,6 +89227,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, {
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.multi_select_insert_combo" ,
type : "bi.multi_select_insert_combo" ,
element : this ,
element : this ,
allowEdit : o . allowEdit ,
text : o . text ,
text : o . text ,
value : o . value ,
value : o . value ,
itemsCreator : BI . bind ( this . _itemsCreator , this ) ,
itemsCreator : BI . bind ( this . _itemsCreator , this ) ,
@ -89301,6 +89323,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this . combo = BI . createWidget ( {
this . combo = BI . createWidget ( {
type : "bi.multi_select_combo" ,
type : "bi.multi_select_combo" ,
element : this ,
element : this ,
allowEdit : o . allowEdit ,
text : o . text ,
text : o . text ,
value : o . value ,
value : o . value ,
itemsCreator : BI . bind ( this . _itemsCreator , this ) ,
itemsCreator : BI . bind ( this . _itemsCreator , this ) ,