@@ -114,7 +114,7 @@ var ArrayProto = Array.prototype,
114114 slice = ArrayProto . slice ,
115115 toString = ObjProto . toString ,
116116 hasOwnProperty = ObjProto . hasOwnProperty ,
117- LIB_VERSION = '1.13.19 ' ,
117+ LIB_VERSION = '1.13.20 ' ,
118118 LIB_NAME = 'MiniProgram' ;
119119
120120var source_channel_standard = 'utm_source utm_medium utm_campaign utm_content utm_term' ;
@@ -265,8 +265,7 @@ sa.lib_version = LIB_VERSION;
265265 _ . extend2Lev = function ( obj ) {
266266 each ( slice . call ( arguments , 1 ) , function ( source ) {
267267 for ( var prop in source ) {
268- if ( source [ prop ] !==
269- void 0 ) {
268+ if ( source [ prop ] !== void 0 && source [ prop ] !== null ) {
270269 if ( _ . isObject ( source [ prop ] ) && _ . isObject ( obj [ prop ] ) ) {
271270 _ . extend ( obj [ prop ] , source [ prop ] ) ;
272271 } else {
@@ -1696,7 +1695,7 @@ function click_proxy(option, method) {
16961695 var prop = { } ,
16971696 type = '' ;
16981697
1699- if ( typeof arguments [ 0 ] === 'object' ) {
1698+ if ( _ . isObject ( arguments [ 0 ] ) ) {
17001699 var target = arguments [ 0 ] . currentTarget || { } ;
17011700 var dataset = target . dataset || { } ;
17021701 type = arguments [ 0 ] [ 'type' ] ;
@@ -1917,8 +1916,10 @@ sa.App = function(option) {
19171916sa . Page = function ( option ) {
19181917 var methods = sa . para . autoTrack && sa . para . autoTrack . mpClick && _ . getMethods ( option ) ;
19191918
1920- for ( var i = 0 , len = methods . length ; i < len ; i ++ ) {
1921- click_proxy ( option , methods [ i ] ) ;
1919+ if ( ! ! methods ) {
1920+ for ( var i = 0 , len = methods . length ; i < len ; i ++ ) {
1921+ click_proxy ( option , methods [ i ] ) ;
1922+ }
19221923 }
19231924 mp_proxy ( option , "onLoad" , 'pageLoad' ) ;
19241925 mp_proxy ( option , "onShow" , 'pageShow' ) ;
@@ -1931,8 +1932,10 @@ sa.Component = function(option) {
19311932 try {
19321933 var methods = sa . para . autoTrack && sa . para . autoTrack . mpClick && _ . getMethods ( option . methods ) ;
19331934
1934- for ( var i = 0 , len = methods . length ; i < len ; i ++ ) {
1935- click_proxy ( option . methods , methods [ i ] ) ;
1935+ if ( ! ! methods ) {
1936+ for ( var i = 0 , len = methods . length ; i < len ; i ++ ) {
1937+ click_proxy ( option . methods , methods [ i ] ) ;
1938+ }
19361939 }
19371940
19381941 mp_proxy ( option . methods , 'onLoad' , 'pageLoad' ) ;
0 commit comments