updated bug修复
This commit is contained in:
mumuy committed
1 parent
8081fc40ee
commit
3ef487c7b0
5 files changed
+52
-29
No files matched your search
Vendored
+10
-4
@@ -1990,9 +1990,13 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
var mid_sex = 0;
|
||||
if(to_arr[i-1].match(/([fhs1](&[ol])?|[olx]b)$/)){
|
||||
mid_sex=1;
|
||||
var mid_sex = -1;
|
||||
if(to_arr[i-1]){
|
||||
if(to_arr[i-1].match(/([fhs1](&[ol])?|[olx]b)$/)){
|
||||
mid_sex=1;
|
||||
}else{
|
||||
mid_sex=0;
|
||||
}
|
||||
}
|
||||
var sex = -1;
|
||||
if(to){
|
||||
@@ -2005,6 +2009,8 @@
|
||||
if(i){
|
||||
var from_sub = from_arr.slice(i).join(',');
|
||||
var to_sub = to_arr.slice(i).join(',');
|
||||
|
||||
console.log('#from_sub#',mid_sex,from_sub,to_sub,reverseId(to_sub,mid_sex));
|
||||
return {
|
||||
'selector':(to_sub?','+reverseId(to_sub,mid_sex):'')+(from_sub?','+from_sub:''),
|
||||
'sex':sex
|
||||
@@ -2033,7 +2039,7 @@
|
||||
from_selectors.forEach(function(from){
|
||||
to_selectors.forEach(function(to){
|
||||
var data = mergeSelector(from,to);
|
||||
// console.log('#data#',data);
|
||||
console.log('#data#',data);
|
||||
sex = data['sex']>-1?data['sex']:options.sex;
|
||||
var ids = selector2id(data['selector'],sex);
|
||||
// console.log('[ids]',ids);
|
||||
|
||||
Vendored
+1
-2
@@ -1,2 +1 @@
|
||||
!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=[],w=!1;for(var l in h){var o=h[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),w=!0)}if(w||(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 b=!0;do{f=s;for(var h in w){var l=w[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]);b=!1;break}}}while(f!=s);if(b){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),x.push(s)}}};return m(s),l(x)}function x(s){var f=[],x=function(s){var f=[];for(var x in h)if(x.replace(/&[ol]/g,"")==s)f.push(h[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(h[x][0]);break}return f};if(h[s])f.push(h[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(h[m][0])}return x.join("的")}function b(s,f){for(var x=s.split(","),m=f.split(","),b=0;b<x.length&&b<m.length&&x[b]==m[b];b++);var w=0;m[b-1].match(/([fhs1](&[ol])?|[olx]b)$/)&&(w=1);var h=-1;if(f&&(h=f.match(/,([fhs1](&[ol])?|[olx]b)$/)?1:0),b){var l=x.slice(b).join(","),o=m.slice(b).join(",");return{selector:(o?","+d(o,w):"")+(l?","+l:""),sex:h}}return{selector:s,sex:h}}var w=[{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"}],h={"":["自己","我","本人","在下"],"[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":["爷爷","祖Line truncated
|
||||
"m,xb,d,d,h":["舅表甥婿"],"m,xb,d,d,s":["舅表甥外孙男","表甥外孙男"],"m,xb,d,d,d":["舅表甥外孙女","表甥外孙女"],"m,ob":["大舅"],"m,ob,w":["大舅妈"],"m,lb":["小舅","舅父仔"],"m,lb,w":["小舅妈"],"m,os":["大姨","大姨妈"],"m,os,h":["大姨父","大姨丈"],"m,ls":["小姨","小姨妈","姨仔"],"m,ls,h":["小姨父","小姨丈"],"m,xs":["姨妈","姨母","姨姨","姨娘","阿姨","姨","x姨","x姨妈"],"m,xs,h":["姨丈","姨父","姨爸","姨爹","姨婿","姨郎","x姨丈","x姨父"],"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":["堂夫甥男","从父夫甥Line truncated
|
||||
!function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){function x(s){for(var f,x=[],d={},m=0;null!=(f=s[m]);m++)(b=f.replace(/[ol](?=s|b)/,"x").replace(/&[ol]/,""))!=f||d[b]||(d[f]=!0);for(var b,m=0;null!=(f=s[m]);m++)(b=f.replace(/[ol](?=s|b)/,"x").replace(/&[ol]/,""))!=f&&d[b]||x.push(f);return x}var o=[{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"}],e={"":["自己","我","本人","在下"],"[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":["太祖父","太祖"],"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,ob":["伯鼻祖父"],"f,f,f,f,f,f,f,f,f,ob,w":["伯鼻祖母"],"f,f,f,f,f,f,f,f,f,lb":["叔鼻祖父"],"f,f,f,f,f,f,f,f,f,lb,w":["叔鼻祖母"],"f,f,f,f,f,f,f,f,f,xs":["姑鼻祖母"],"f,f,f,f,f,f,f,f,f,xs,h":["姑鼻祖父"],"f,f,f,f,f,f,f,f,m":["鼻祖母"],"f,f,f,f,f,f,f,f,m,xs":["姨鼻祖母"],"f,f,f,f,f,f,f,f,m,xs,h":["姨鼻祖父"],"f,f,f,f,f,f,f,f,m,xb":["舅鼻祖父"],"f,f,f,f,f,f,f,f,m,xb,w":["舅鼻祖母"],"f,f,f,f,f,f,f,f,ob":["伯远祖父"],"f,f,f,f,f,f,f,f,ob,w":["伯远祖母"],"f,f,f,f,f,f,f,f,lb":["叔远祖父"],"f,f,f,f,f,f,f,f,lb,w":["叔远祖母"],"f,f,f,f,f,f,f,f,xs":["姑远祖母"],"f,f,f,f,f,f,f,f,xs,h":["姑远祖父"],"f,f,f,f,f,f,f,m":["远祖母"],"f,f,f,f,f,f,f,m,xs":["姨远祖母"],"f,f,f,f,f,f,f,m,xs,h":["姨远祖父"],"f,f,f,f,f,f,f,m,xb":["舅远祖父"],"f,f,f,f,f,f,f,m,xb,w":["舅远祖母"],"f,f,f,f,f,f,f,ob":["伯太祖父"],"f,f,f,f,f,f,f,ob,w":["伯太祖母"],"f,f,f,f,f,f,f,lb":["叔太祖父"],"f,f,f,f,f,f,f,lb,w":["叔太祖母"],"f,f,f,f,f,f,f,xs":["姑太祖母"],"f,f,f,f,f,f,f,xs,h":["姑太祖父"],"f,f,f,f,f,f,m":["太祖母"],"f,f,f,f,f,f,m,xs":["姨太祖母"],"f,f,f,f,f,f,m,xs,h":["姨太祖父"],"f,f,f,f,f,f,m,xb":["舅太祖父"],"f,f,f,f,f,f,m,xb,w":["舅太祖母"],"f,f,f,f,f,f,ob":["伯烈祖父"],"f,f,f,f,f,f,ob,w":["伯烈祖母"],"f,f,f,f,f,f,lb":["叔烈祖父"],"f,f,f,f,f,f,lb,w":["叔烈祖母"],"f,f,f,f,f,f,xs":["姑烈祖母"],"f,f,f,f,f,f,xs,h":["姑烈祖父"],"f,f,f,f,f,m":["烈祖母"],"f,f,f,f,f,m,xs":["姨烈祖母"],"f,f,f,f,f,m,xs,h":["姨烈祖父"],"f,f,f,f,f,m,xb":["舅烈祖父"],"f,f,f,f,f,m,xb,w":["舅烈祖母"],"f,f,f,f,f,ob":["伯天祖父"],"f,f,f,f,f,ob,w":["伯天祖母"],"f,f,f,f,f,lb"Line truncated
|
||||
+29
-17
@@ -17,7 +17,7 @@
|
||||
<script type="text/javascript">
|
||||
setTimeout(function(){
|
||||
if(location.hostname.indexOf('passer-by.com')<0){
|
||||
location.href = 'http://passer-by.com/';
|
||||
//location.href = 'http://passer-by.com/';
|
||||
}else if( window.top != window.self ) {
|
||||
window.top.location = self.location.href;
|
||||
}
|
||||
@@ -117,6 +117,17 @@
|
||||
<p>计算结果：</p>
|
||||
<p><textarea name="result" readonly></textarea></p>
|
||||
</div>
|
||||
<div class="intro">
|
||||
<h3>使用案例</h3>
|
||||
<p class="q">1. 使用别称查询：</p>
|
||||
<p class="a">姥姥的爸爸的老窦 / 娘子的爹地的母亲 / 岳丈的妈咪</p>
|
||||
<p class="q">2. 使用合称查询：</p>
|
||||
<p class="a">舅舅的孙辈 / 爸爸的祖父母 / 姑妈的兄弟姐妹</p>
|
||||
<p class="q">3. 大小数字混合查询：</p>
|
||||
<p class="a">儿子的大舅的二姑妈的七舅姥爷</p>
|
||||
<p class="q">4. 不限制方向祖辈孙辈跨度，反复查询：</p>
|
||||
<p class="a">舅妈的婆婆的外甥的姨妈的侄子的爷爷</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="c-panel">
|
||||
<div class="row">
|
||||
@@ -135,12 +146,19 @@
|
||||
<p>计算结果：</p>
|
||||
<p><textarea name="result" readonly></textarea></p>
|
||||
</div>
|
||||
<div class="intro">
|
||||
<h3>应用场景</h3>
|
||||
<p class="q">“七舅姥爷”和我是什么关系？</p>
|
||||
<p class="q">“姑表舅表哥”和我是什么关系？</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="c-panel">
|
||||
<div class="row">
|
||||
<div class="field">
|
||||
<input class="input-text" type="text" name="person" placeholder="输入称呼"/>
|
||||
<input class="input-text" type="text" name="person" placeholder="输入要查询的称呼"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="field">
|
||||
称呼方式：
|
||||
<label for="field-3-1">
|
||||
@@ -152,8 +170,10 @@
|
||||
<span>后者称呼前者</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="field">
|
||||
<input class="input-text" type="text" name="target" placeholder="输入称呼"/>
|
||||
<input class="input-text" type="text" name="target" placeholder="输入要查询的称呼"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="operation">
|
||||
@@ -166,28 +186,20 @@
|
||||
<p>计算结果：</p>
|
||||
<p><textarea name="result" readonly></textarea></p>
|
||||
</div>
|
||||
<div class="intro">
|
||||
<h3>应用场景</h3>
|
||||
<p class="q">外舅公是我妈的谁？</p>
|
||||
<p class="q">我爸应该叫舅老爷什么？</p>
|
||||
<p class="q">我岳父应该叫我弟弟什么？</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="c-ft">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="ft">
|
||||
<div class="intro">
|
||||
<p>由于工作生活节奏不同，如今很多关系稍疏远的亲戚之间来往并不多。因此放假回家过年时，往往会搞不清楚哪位亲戚应该喊什么称呼，很是尴尬。然而搞不清亲戚关系和亲戚称谓的不仅是小孩，就连年轻一代的大人也都常常模糊混乱。</p>
|
||||
<p>“中国亲戚关系计算器”为你避免了这种尴尬，只需简单的输入即可算出称谓。输入框兼容了不同的叫法，你可以称呼父亲为：“老爸”、“爹地”、“老爷子”等等，方面不同地域的习惯叫法。</p>
|
||||
</div>
|
||||
<div class="intro">
|
||||
<h3>使用案例</h3>
|
||||
<p class="q">1. 使用别称查询：</p>
|
||||
<p class="a">姥姥的爸爸的老窦 / 娘子的爹地的母亲 / 岳丈的妈咪</p>
|
||||
<p class="q">2. 使用合称查询：</p>
|
||||
<p class="a">舅舅的孙辈 / 爸爸的祖父母 / 姑妈的兄弟姐妹</p>
|
||||
<p class="q">3. 大小数字混合查询：</p>
|
||||
<p class="a">儿子的大舅的二姑妈的七舅姥爷</p>
|
||||
<p class="q">4. 不限制方向祖辈孙辈跨度，反复查询：</p>
|
||||
<p class="a">舅妈的婆婆的外甥的姨妈的侄子的爷爷</p>
|
||||
</div>
|
||||
<div class="copy">
|
||||
<p><a class="github-button" href="https://github.com/mumuy" data-style="mega" data-count-href="/mumuy/followers" data-count-api="/users/mumuy#followers" data-count-aria-label="# followers on GitHub" aria-label="Follow @mumuy on GitHub" rel="nofollow">Follow @mumuy</a>
|
||||
<a class="github-button" href="https://github.com/mumuy/relationship" data-style="mega" data-count-href="/mumuy/relationship/stargazers" data-count-api="/repos/mumuy/relationship#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star mumuy/relationship on GitHub" rel="nofollow">Star</a></p>
|
||||
|
||||
+10
-4
@@ -1990,9 +1990,13 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
var mid_sex = 0;
|
||||
if(to_arr[i-1].match(/([fhs1](&[ol])?|[olx]b)$/)){
|
||||
mid_sex=1;
|
||||
var mid_sex = -1;
|
||||
if(to_arr[i-1]){
|
||||
if(to_arr[i-1].match(/([fhs1](&[ol])?|[olx]b)$/)){
|
||||
mid_sex=1;
|
||||
}else{
|
||||
mid_sex=0;
|
||||
}
|
||||
}
|
||||
var sex = -1;
|
||||
if(to){
|
||||
@@ -2005,6 +2009,8 @@
|
||||
if(i){
|
||||
var from_sub = from_arr.slice(i).join(',');
|
||||
var to_sub = to_arr.slice(i).join(',');
|
||||
|
||||
console.log('#from_sub#',mid_sex,from_sub,to_sub,reverseId(to_sub,mid_sex));
|
||||
return {
|
||||
'selector':(to_sub?','+reverseId(to_sub,mid_sex):'')+(from_sub?','+from_sub:''),
|
||||
'sex':sex
|
||||
@@ -2033,7 +2039,7 @@
|
||||
from_selectors.forEach(function(from){
|
||||
to_selectors.forEach(function(to){
|
||||
var data = mergeSelector(from,to);
|
||||
// console.log('#data#',data);
|
||||
console.log('#data#',data);
|
||||
sex = data['sex']>-1?data['sex']:options.sex;
|
||||
var ids = selector2id(data['selector'],sex);
|
||||
// console.log('[ids]',ids);
|
||||
|
||||
+2
-2
@@ -222,7 +222,7 @@ a:hover{
|
||||
margin-right: 10px;
|
||||
}
|
||||
.mod-panel .ft{
|
||||
padding-top: 20px;
|
||||
padding-top: 10px;
|
||||
border-top:1px dotted #e0e0e0;
|
||||
}
|
||||
.mod-panel .about{
|
||||
@@ -243,7 +243,7 @@ a:hover{
|
||||
}
|
||||
.mod-panel .intro{
|
||||
padding: 15px 20px;
|
||||
margin-bottom: 15px;
|
||||
margin: 15px 0;
|
||||
background: #f5f5f6;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user