updated 解决冲突

dist/relationship.js

@@ -1968,15 +1968,12 @@
 	}
 
 	return (function (parameter){
-		var options = {
+		var options = Object.assign({
 			text:'',
 			sex:-1,
 			type:'default',		//为'chain'时,reverse无效
 			reverse:false
-		};
-		for (var p in parameter) {
-			options[p] = parameter[p];
-		}
+		},parameter);
 		var selectors = getSelectors(options.text);
 		// console.log('[selectors]',selectors);
 		var result = [];							//匹配结果

dist/relationship.min.js

@@ -1,2 +1,2 @@
 !function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){function s(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x");for(var f=s.replace(/我的?/,"").replace(/家的?/,"的").split("的"),x=[],d=!0;f.length;){var m=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(d=!1),x.length){for(var e=[],l=0;l<x.length;l++)for(var r=0;r<b.length;r++)e.push(x[l]+","+b[r]);x=e}else for(var l=0;l<b.length;l++)x.push(","+b[l])}return d?x:[]}function f(s,f){var x=[],d={};if(f<0?0==s.indexOf(",w")?s=",1"+s:0==s.indexOf(",h")&&(s=",0"+s):0==s.indexOf(",1")||0==s.indexOf(",0")||f>-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e<o.length;e++)m(o[e]);w=!1;break}}}while(f!=s);if(w){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),x.push(s)}}};return m(s),h(x)}function x(s){var f=[],x=function(s){var f=[];for(var x in w)if(x.replace(/&[ol]/g,"")==s)f.push(w[x][0]);else for(var d=s;d.match(/[ol](b|s)/);)if(d=d.replace(/[ol](b|s)/,"x$1"),d==x){f.push(w[x][0]);break}return f};if(w[s])f.push(w[s][0]);else if(f=x(s),f.length||(s=s.replace(/&[ol]/g,""),f=x(s)),f.length||(s=s.replace(/[ol](b|s)/g,"x$1"),f=x(s)),!f.length){var d=s.replace(/x/g,"l");f=x(d);var m=s.replace(/x/g,"o");f=f.concat(x(m))}return f}function d(s,f){var x={f:["d","s"],m:["d","s"],h:["w",""],w:["","h"],s:["m","f"],d:["m","f"],lb:["os","ob"],ob:["ls","lb"],xb:["xs","xb"],ls:["os","ob"],os:["ls","lb"],xs:["xs","xb"]},d="";if(s.indexOf("&o")>-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var m=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");m=m.substring(0,m.lastIndexOf(","));for(var b=s.split(",").reverse(),w=m.split(",").reverse(),h=[],l=0;l<b.length;l++)h.push(x[b[l]][w[l]]);return h.join(",")+d}return""}function m(s){for(var f=s.split(","),x=[],d=0;d<f.length;d++){var m=f[d].replace(/&[ol]/,"");x.push(w[m][0])}return x.join("的")}var b=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/(,[ds],(.+),[ds])&[ol]/g,str:"$1"},{exp:/(,o[sb])+(,o[sb])/,str:"$2"},{exp:/(,l[sb])+(,l[sb])/,str:"$2"},{exp:/^(.*)(,[fh1])(,[olx][sb])+,[olx]b(.*)$/,str:"$1$2,xb$4#$1$2$4"},{exp:/^(.*)(,[mw0])(,[olx][sb])+,[olx]s(.*)$/,str:"$1$2,xs$4#$1$2$4"},{exp:/(,[fh1])(,[olx][sb])+,[olx]s/g,str:"$1,xs"},{exp:/(,[mw0])(,[olx][sb])+,[olx]b/g,str:"$1,xb"},{exp:/^,[olx][sb],[olx]b(.+)?$/,str:"$1#,xb$1"},{exp:/^,[olx][sb],[olx]s(.+)?$/,str:"$1#,xs$1"},{exp:/^,x([sb])$/,str:",o$1#,l$1"},{exp:/m,h/g,str:"f"},{exp:/f,w/g,str:"m"},{exp:/,[xol][sb](,[mf])/g,str:"$1"},{exp:/,[mf],d&([ol])/,str:",$1s"},{exp:/,[mf],s&([ol])/,str:",$1b"},{exp:/^(.*)(,[fh1]|[xol]b),[mf],s(.*)$/,str:"$1$2,xb$3#$1$2$3"},{exp:/^(.*)(,[mw0]|[xol]s),[mf],d(.*)$/,str:"$1$2,xs$3#$1$2$3"},{exp:/(,[mw0]|[xol]s),[mf],s/,str:"$1,xb"},{exp:/(,[fh1]|[xol]b),[mf],d/,str:"$1,xs"},{exp:/^,[mf],s(.+)?$/,str:",1$1#,xb$1"},{exp:/^,[mf],d(.+)?$/,str:",0$1#,xs$1"},{exp:/,[ds]&o,ob/g,str:",s&o"},{exp:/,[ds]&o,os/g,str:",d&o"},{exp:/,[ds]&l,lb/g,str:",s&l"},{exp:/,[ds]&l,ls/g,str:",d&l"},{exp:/,[ds](&[ol])?,[olx]s/g,str:",d"},{exp:/,[ds](&[ol])?,[olx]b/g,str:",s"},{exp:/(,[mwd0](&[ol])?|[olx]s),[ds](&[ol])?,m/g,str:"$1"},{exp:/(,[mwd0](&[ol])?|[olx]s),[ds](&[ol])?,f/g,str:"$1,h"},{exp:/(,[fhs1](&[ol])?|[olx]b),[ds](&[ol])?,f/g,str:"$1"},{exp:/(,[fhs1](&[ol])?|[olx]b),[ds](&[ol])?,m/g,str:"$1,w"},{exp:/^,[ds],m(.+)?$/,str:"$1#,w$1"},{exp:/^,[ds],f(.+)?$/,str:"$1#,h$1"},{exp:/,[wh](,[ds])/g,str:"$1"},{exp:/,w,h|,h,w/g,str:""},{exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)?\](.+)?/g,str:"$1$2$4#$1[$3]$4"},{exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g,str:"$1$2$4#$1$3$4"}],w={"":["自己","我","本人","在下"],"[f,f|f,m|m,f|m,m]":["祖辈","祖父母"],"[f|m]":["父母","爹娘","爹妈","爸妈","双亲","二亲","两亲","二老","高堂"],"[h,f|h,m]":["公婆"],"[w,f|w,m]":["岳父母"],"[xb|xs]":["兄弟姐妹","同胞","手足"],"[f,xb,s&o|f,xb,s&l]":["堂兄弟"],"[f,xb,d&o|f,xb,d&l]":["堂姐妹","堂姊妹"],"[f,xs,s&o|f,xs,s&l|m,xb,s&o|m,xb,s&l]":["表兄弟"],"[f,xs,d&o|f,xs,d&l|m,xb,d&o|m,xb,d&l]":["表姐妹","表姊妹"],"[s|d]":["子女","儿女","小孩","孩子","孩儿","宝宝","娃"],"[s,s|s,d|d,s|d,d]":["孙辈"],f:["爸爸","父亲","阿爸","老爸","老窦","爸","父","爹","爹爹","爹地","爹啲","老爹","大大","老爷子"],"f,f":["爷爷","祖父","阿爷","奶爷","阿公","老爷"],"f,f,f":["曾祖父","曾祖","太爷","太爷爷","太公","祖公","祖奶爷","太老爷"],"f,f,f,f":["高祖父","老太奶爷","老太爷","祖太爷","祖太爷爷","祖太公","高王父"],"f,f,f,f,f":["天祖父","高祖"],"f,f,f,f,f,f":["烈祖父","烈祖"],"f,f,f,f,f,f,f":["太祖父","太祖Line truncated
-"m,xs,h,f":["姨姻祖父","姻爷爷"],"m,xs,h,m":["姨姻祖母","姻奶奶"],"m,xs,h,ob":["姨姻伯父","姻伯父","姻世伯"],"m,xs,h,ob,w":["姨姻伯母","姻伯母"],"m,xs,h,lb":["姨姻叔父","姻叔父"],"m,xs,h,lb,w":["姨姻叔母","姻叔母"],"m,xs,h,xs":["姨姻姑母","姻姑母"],"m,xs,h,xs,h":["姨姻姑父","姻姑父"],"m,xs,s&o":["姨哥","姨兄","从母兄"],"m,xs,s&o,w":["姨嫂","姨兄妇","从母嫂","从母兄妇"],"m,xs,s&l":["姨弟","从母弟"],"m,xs,s&l,w":["姨弟妇","从母弟妇"],"m,xs,s,s":["姨侄男","从母侄男","姨侄"],"m,xs,s,s,w":["姨侄妇","从母侄妇"],"m,xs,s,s,s":["姨侄孙男","姨侄孙","从母侄孙"],"m,xs,s,s,s,w":["姨侄孙妇","从母侄孙妇"],"m,xs,s,s,d":["姨侄孙女","从母侄孙女"],"m,xs,s,s,d,h":["姨侄孙婿","从母侄孙婿"],"m,xs,s,d":["姨侄女","从母侄女","姨侄"],"m,xs,s,d,h":["姨侄婿","从母侄婿"],"m,xs,s,d,s":["姨侄外孙男","姨侄外孙","从母侄外孙"],"m,xs,s,d,s,w":["姨侄外孙妇","从母侄外孙妇"],"m,xs,s,d,d":["姨侄外孙女","从母侄外孙女"],"m,xs,s,d,d,h":["姨侄外孙婿","从母侄外孙婿"],"m,xs,d&o":["姨姐","姨姊","从母姐","从母姊"],"m,xs,d&o,h":["姨姐夫","姨姊夫","从母姐夫","从母姊夫","从母姊丈","从母姊婿","从母姊郎"],"m,xs,d&l":["姨妹","从母妹"],"m,xs,d&l,h":["姨妹夫","从母妹夫","从母妹丈","从母妹婿","从母妹郎"],"m,xs,d,s":["姨甥男","从母甥男","姨外甥","姨甥"],"m,xs,d,s,w":["姨甥妇","从母甥妇"],"m,xs,d,s,s":["姨甥孙男","姨甥孙","从母甥孙"],"m,xs,d,s,s,w":["姨甥孙妇","从母甥孙妇"],"m,xs,d,s,d":["姨甥孙女","从母甥孙女"],"m,xs,d,s,d,h":["姨甥孙婿","从母甥孙婿"],"m,xs,d,d":["姨甥女","从母甥女","姨外甥女","姨甥"],"m,xs,d,d,h":["姨甥婿","从母甥婿"],"m,xs,d,d,s":["姨甥外孙男","姨甥外孙","从母甥外孙"],"m,xs,d,d,s,w":["姨甥外孙妇","从母甥外孙妇"],"m,xs,d,d,d":["姨甥外孙女","从母甥外孙女"],"m,xs,d,d,d,h":["姨甥外孙婿","从母甥外孙婿"],h:["老公","丈夫","先生","官人","男人","汉子","夫","夫君","相公","夫婿","良人","爱人","老伴","老头子"],"h,f":["公公","翁亲","老公公"],"h,f,f":["祖公","祖翁","奶公父"],"h,f,f,f":["曾祖公","太公翁"],"h,f,f,f,ob":["伯曾祖公","太伯翁"],"h,f,f,f,ob,w":["伯曾祖婆","太姆婆"],"h,f,f,f,lb":["叔曾祖公","太叔翁"],"h,f,f,f,lb,w":["叔曾祖婆","太婶婆"],"h,f,f,m":["曾祖婆","太奶亲"],"h,f,f,ob":["伯祖公","伯祖翁"],"h,f,f,ob,w":["伯祖婆"],"h,f,f,lb":["叔祖公","叔祖翁"],"h,f,f,lb,w":["叔祖婆"],"h,f,f,xb,s&o":["堂伯老爷"],"h,f,f,xb,s&o,w":["堂伯奶奶"],"h,f,f,xb,s&l":["堂叔老爷"],"h,f,f,xb,s&l,w":["堂叔奶奶"],"h,f,f,xb,s,s&o":["从堂大伯"],"h,f,f,xb,s,s&o,w":["从堂嫂"],"h,f,f,xb,s,s&l":["从堂叔仔"],"h,f,f,xb,s,s&l,w":["从堂弟媳"],"h,f,f,xb,s,d&o":["从堂大姑"],"h,f,f,xb,s,d&o,h":["从堂大姑夫"],"h,f,f,xb,s,d&l":["从堂小姑"],"h,f,f,xb,s,d&l,h":["从堂小姑夫"],"h,f,f,xb,d":["堂姑奶奶"],"h,f,f,xb,d,h":["堂姑老爷"],"h,f,f,xb,d,d&o":["堂姑表大姑"],"h,f,f,xb,d,d&o,h":["堂姑表大姑夫"],"h,f,f,xb,d,d&l":["堂姑表小姑"],"h,f,f,xb,d,d&l,h":["堂姑表小姑夫"],"h,f,f,xs":["姑祖婆"],"h,f,f,xs,h":["姑祖公"],"h,f,m":["祖婆","奶婆母"],"h,f,m,f":["曾外祖公"],"h,f,m,m":["曾外祖婆"],"h,f,m,xb":["舅祖公"],"h,f,m,xb,w":["舅祖婆"],"h,f,m,xs":["姨祖婆"],"h,f,m,xs,h":["姨祖公"],"h,f,ob":["伯公父","伯翁"],"h,f,ob,w":["伯婆母","伯婆"],"h,f,lb":["叔公父","叔公","叔翁","叔祖"],"h,f,lb,w":["叔婆母","叔婆","婶婆","婶亲"],"h,f,xb,s&o":["堂大伯子","从父大伯子","从父大伯兄","堂大伯","从父大伯","夫从兄"],"h,f,xb,s&o,w":["堂大伯嫂","从父大伯嫂","堂大姆","从父大姆","从兄嫂"],"h,f,xb,s&l":["堂小叔弟","从父小叔弟","堂叔仔","从父叔仔","夫从弟"],"h,f,xb,s&l,w":["堂小叔弟妇","从父小叔弟妇","堂小弟","从父小弟","从弟妇"],"h,f,xb,s,s":["堂夫侄男","从父夫侄男"],"h,f,xb,s,d":["堂夫侄女","从父夫侄女"],"h,f,xb,d&o":["堂大姑姐","从父大姑姐","从父大姑姊"],"h,f,xb,d&o,h":["堂大姑姐夫","从父大姑姐夫","从父大姑姊夫"],"h,f,xb,d&l":["堂小姑妹","从父小姑妹"],"h,f,xb,d&l,h":["堂小姑妹夫","从父小姑妹夫"],"h,f,xb,d,s":["堂夫甥男","从父夫甥男"],"h,f,xb,d,d":["堂夫甥女","从父夫甥女"],"h,f,xs":["姑婆母","姑婆"],"h,f,xs,h":["姑公父","姑公"],"h,f,xs,s&o":["姑表大伯子","姑表大伯兄","表大伯"],"h,f,xs,s&o,w":["姑表大伯嫂","表大姆"],"h,f,xs,s&l":["姑表小叔弟","表叔仔"],"h,f,xs,s&l,w":["姑表小叔弟妇","表小弟"],"h,f,xs,s,s":["姑表夫侄男"],"h,f,xs,s,d":["姑表夫侄女"],"h,f,xs,d&o":["姑表大姑姐","姑表大姑姊","表大姑"],"h,f,xs,d&o,h":["姑表大姑姐夫","姑表大姑姊夫"],"h,f,xs,d&l":["姑Line truncated
+"m,xs,h,f":["姨姻祖父","姻爷爷"],"m,xs,h,m":["姨姻祖母","姻奶奶"],"m,xs,h,ob":["姨姻伯父","姻伯父","姻世伯"],"m,xs,h,ob,w":["姨姻伯母","姻伯母"],"m,xs,h,lb":["姨姻叔父","姻叔父"],"m,xs,h,lb,w":["姨姻叔母","姻叔母"],"m,xs,h,xs":["姨姻姑母","姻姑母"],"m,xs,h,xs,h":["姨姻姑父","姻姑父"],"m,xs,s&o":["姨哥","姨兄","从母兄"],"m,xs,s&o,w":["姨嫂","姨兄妇","从母嫂","从母兄妇"],"m,xs,s&l":["姨弟","从母弟"],"m,xs,s&l,w":["姨弟妇","从母弟妇"],"m,xs,s,s":["姨侄男","从母侄男","姨侄"],"m,xs,s,s,w":["姨侄妇","从母侄妇"],"m,xs,s,s,s":["姨侄孙男","姨侄孙","从母侄孙"],"m,xs,s,s,s,w":["姨侄孙妇","从母侄孙妇"],"m,xs,s,s,d":["姨侄孙女","从母侄孙女"],"m,xs,s,s,d,h":["姨侄孙婿","从母侄孙婿"],"m,xs,s,d":["姨侄女","从母侄女","姨侄"],"m,xs,s,d,h":["姨侄婿","从母侄婿"],"m,xs,s,d,s":["姨侄外孙男","姨侄外孙","从母侄外孙"],"m,xs,s,d,s,w":["姨侄外孙妇","从母侄外孙妇"],"m,xs,s,d,d":["姨侄外孙女","从母侄外孙女"],"m,xs,s,d,d,h":["姨侄外孙婿","从母侄外孙婿"],"m,xs,d&o":["姨姐","姨姊","从母姐","从母姊"],"m,xs,d&o,h":["姨姐夫","姨姊夫","从母姐夫","从母姊夫","从母姊丈","从母姊婿","从母姊郎"],"m,xs,d&l":["姨妹","从母妹"],"m,xs,d&l,h":["姨妹夫","从母妹夫","从母妹丈","从母妹婿","从母妹郎"],"m,xs,d,s":["姨甥男","从母甥男","姨外甥","姨甥"],"m,xs,d,s,w":["姨甥妇","从母甥妇"],"m,xs,d,s,s":["姨甥孙男","姨甥孙","从母甥孙"],"m,xs,d,s,s,w":["姨甥孙妇","从母甥孙妇"],"m,xs,d,s,d":["姨甥孙女","从母甥孙女"],"m,xs,d,s,d,h":["姨甥孙婿","从母甥孙婿"],"m,xs,d,d":["姨甥女","从母甥女","姨外甥女","姨甥"],"m,xs,d,d,h":["姨甥婿","从母甥婿"],"m,xs,d,d,s":["姨甥外孙男","姨甥外孙","从母甥外孙"],"m,xs,d,d,s,w":["姨甥外孙妇","从母甥外孙妇"],"m,xs,d,d,d":["姨甥外孙女","从母甥外孙女"],"m,xs,d,d,d,h":["姨甥外孙婿","从母甥外孙婿"],h:["老公","丈夫","先生","官人","男人","汉子","夫","夫君","相公","夫婿","良人","爱人","老伴","老头子"],"h,f":["公公","翁亲","老公公"],"h,f,f":["祖公","祖翁","奶公父"],"h,f,f,f":["曾祖公","太公翁"],"h,f,f,f,ob":["伯曾祖公","太伯翁"],"h,f,f,f,ob,w":["伯曾祖婆","太姆婆"],"h,f,f,f,lb":["叔曾祖公","太叔翁"],"h,f,f,f,lb,w":["叔曾祖婆","太婶婆"],"h,f,f,m":["曾祖婆","太奶亲"],"h,f,f,ob":["伯祖公","伯祖翁"],"h,f,f,ob,w":["伯祖婆"],"h,f,f,lb":["叔祖公","叔祖翁"],"h,f,f,lb,w":["叔祖婆"],"h,f,f,xb,s&o":["堂伯老爷"],"h,f,f,xb,s&o,w":["堂伯奶奶"],"h,f,f,xb,s&l":["堂叔老爷"],"h,f,f,xb,s&l,w":["堂叔奶奶"],"h,f,f,xb,s,s&o":["从堂大伯"],"h,f,f,xb,s,s&o,w":["从堂嫂"],"h,f,f,xb,s,s&l":["从堂叔仔"],"h,f,f,xb,s,s&l,w":["从堂弟媳"],"h,f,f,xb,s,d&o":["从堂大姑"],"h,f,f,xb,s,d&o,h":["从堂大姑夫"],"h,f,f,xb,s,d&l":["从堂小姑"],"h,f,f,xb,s,d&l,h":["从堂小姑夫"],"h,f,f,xb,d":["堂姑奶奶"],"h,f,f,xb,d,h":["堂姑老爷"],"h,f,f,xb,d,d&o":["堂姑表大姑"],"h,f,f,xb,d,d&o,h":["堂姑表大姑夫"],"h,f,f,xb,d,d&l":["堂姑表小姑"],"h,f,f,xb,d,d&l,h":["堂姑表小姑夫"],"h,f,f,xs":["姑祖婆"],"h,f,f,xs,h":["姑祖公"],"h,f,m":["祖婆","奶婆母"],"h,f,m,f":["曾外祖公"],"h,f,m,m":["曾外祖婆"],"h,f,m,xb":["舅祖公"],"h,f,m,xb,w":["舅祖婆"],"h,f,m,xs":["姨祖婆"],"h,f,m,xs,h":["姨祖公"],"h,f,ob":["伯公父","伯翁"],"h,f,ob,w":["伯婆母","伯婆"],"h,f,lb":["叔公父","叔公","叔翁","叔祖"],"h,f,lb,w":["叔婆母","叔婆","婶婆","婶亲"],"h,f,xb,s&o":["堂大伯子","从父大伯子","从父大伯兄","堂大伯","从父大伯","夫从兄"],"h,f,xb,s&o,w":["堂大伯嫂","从父大伯嫂","堂大姆","从父大姆","从兄嫂"],"h,f,xb,s&l":["堂小叔弟","从父小叔弟","堂叔仔","从父叔仔","夫从弟"],"h,f,xb,s&l,w":["堂小叔弟妇","从父小叔弟妇","堂小弟","从父小弟","从弟妇"],"h,f,xb,s,s":["堂夫侄男","从父夫侄男"],"h,f,xb,s,d":["堂夫侄女","从父夫侄女"],"h,f,xb,d&o":["堂大姑姐","从父大姑姐","从父大姑姊"],"h,f,xb,d&o,h":["堂大姑姐夫","从父大姑姐夫","从父大姑姊夫"],"h,f,xb,d&l":["堂小姑妹","从父小姑妹"],"h,f,xb,d&l,h":["堂小姑妹夫","从父小姑妹夫"],"h,f,xb,d,s":["堂夫甥男","从父夫甥男"],"h,f,xb,d,d":["堂夫甥女","从父夫甥女"],"h,f,xs":["姑婆母","姑婆"],"h,f,xs,h":["姑公父","姑公"],"h,f,xs,s&o":["姑表大伯子","姑表大伯兄","表大伯"],"h,f,xs,s&o,w":["姑表大伯嫂","表大姆"],"h,f,xs,s&l":["姑表小叔弟","表叔仔"],"h,f,xs,s&l,w":["姑表小叔弟妇","表小弟"],"h,f,xs,s,s":["姑表夫侄男"],"h,f,xs,s,d":["姑表夫侄女"],"h,f,xs,d&o":["姑表大姑姐","姑表大姑姊","表大姑"],"h,f,xs,d&o,h":["姑表大姑姐夫","姑表大姑姊夫"],"h,f,xs,d&l":["姑Line truncated

script/relationship.js

@@ -1968,15 +1968,12 @@
 	}
 
 	return (function (parameter){
-		var options = {
+		var options = Object.assign({
 			text:'',
 			sex:-1,
 			type:'default',		//为'chain'时,reverse无效
 			reverse:false
-		};
-		for (var p in parameter) {
-			options[p] = parameter[p];
-		}
+		},parameter);
 		var selectors = getSelectors(options.text);
 		// console.log('[selectors]',selectors);
 		var result = [];							//匹配结果