docker/relationship
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated 一处去重逻辑恢复，修复bug

Browse Source
This commit is contained in:
PASSER-BY committed 2022-03-16 07:40:34 +08:00
1 parent 794324bf7e
commit 53d5c10682
2 files changed
+17 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dist/relationship.min.js
Vendored
+2 -2
View File
@@ -6,5 +6,5 @@
* Released under the MIT License.
* https://github.com/mumuy/relationship/blob/master/LICENSE
*/
!function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){function s(s){for(var f,x=[],m={},d=0;null!=(f=s[d]);d++){var b=f.replace(/[ol](?=s|b)/,"x").replace(/&[ol]/,"");b!=f||m[b]||(m[f]=!0)}for(var d=0;null!=(f=s[d]);d++){var b=f.replace(/[ol](?=s|b)/,"x").replace(/&[ol]/,"");b!=f?m[b]||x.indexOf(f)==-1&&x.push(f):x.indexOf(f)==-1&&x.push(f)}return x}function f(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x"),s=s.replace(/之/,"的").replace(/我的?(.+)/,"$1"),s.match(/[^娘婆亲]家的?/)&&(s=s.replace(/家的?/,"的"));for(var f=s.split("的"),x=[],m=!0,d={"哥":"兄","姐":"姊","侄":"姪","祖父":"王父","祖母":"王母","孙女婿":"孙婿","甥女婿":"甥婿","侄女婿":"侄婿","弟媳":"弟妇","孙媳妇":"孙妇","甥媳妇":"甥妇","侄媳妇":"侄妇"},b={"^表":["姑表","舅表"],"^姻":["姑姻","姨姻","姊妹姻","女姻"],"^眷":["叔眷","舅眷","兄弟眷","男眷"],"^外甥":["甥"],"^外表伯":["姑表伯外","舅表伯外"],"^外表叔":["姑表叔外","舅表叔外"],"^外表姑":["姑表姑外","舅表姑外"],"^外表舅":["姑表舅外","舅表舅外"],"^外表姨":["姑表姨外","舅表姨外"],"祖$":["祖父","祖母"],"孙$":["孙男","孙女"],"甥$":["甥男","甥女"],"侄$":["侄男","侄女"],"外甥$":["甥"],"嫂$":["兄妇"]};f.length;){var h=f.shift(),o=[],w=[h];for(var M in d){var l=h.replace(M,d[M]),r=h.replace(d[M],M);l!=h&&w.push(l),r!=h&&w.push(r)}var e=function(s){for(var f in b){var x=b[f];x.forEach(function(x){var m=s.replace(new RegExp(f),x);m!=s&&(w.push(m),e(m))})}};if(e(h),w.forEach(function(s){for(var f in G)G[f].indexOf(s)>-1&&o.push(f)}),!o.length)for(var t in G){var n=G[t];w.forEach(function(s){n.indexOf(s)>-1&&o.push(t)})}o.length||(m=!1);var a=[];x.length||(x=[""]),x.forEach(function(s){o.forEach(function(f){a.push(s+(f?","+f:""))})}),x=a}return m?x:[]}function x(f,x){var m=[],d={};x<0&&(f.match(/^,w/)?x=1:f.match(/^,h/)&&(x=0));var b=function(s,f){if(s.indexOf(",1")==-1&&s.indexOf(",0")==-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var x="";if(!d[s]){d[s]=!0;var h=!0;do{x=s;for(var w in o){var M=o[w];if(s=s.replace(M.exp,M.str),s.indexOf("#")>-1){for(var l=s.split("#"),r=0;r<l.length;r++)b(l[r]);h=!1;break}}}while(x!=s);if(h){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),m.push(s)}}};return x<0?(b(f,1),b(f,0)):b(f,x),s(m)}function m(s){var f=[],x=function(s){var f=[];for(var x in G)if(x.replace(/&[ol]/g,"")==s)f.push(G[x][0]);else for(var m=s;m.match(/[ol](b|s)/);)if(m=m.replace(/[ol](b|s)/,"x$1"),m==x){f.push(G[x][0]);break}return f};if(G[s])f.push(G[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 m=s.replace(/x/g,"l");f=x(m);var d=s.replace(/x/g,"o");f=f.concat(x(d))}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"]},m="";if(s.match(/&o$/)?m="&l":s.match(/&l$/)&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f<0&&(s.match(/^w/)?f=1:s.match(/^h/)&&(f=0));var d=[],b=function(f){var d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),h=d.split(",").reverse(),o=[],w=0;w<b.length;w++)o.push(x[b[w]][h[w]]);var M=0,l={f:1,m:1,s:-1,d:-1};return o.forEach(function(s){M+=l[s]||0}),o.join(",")+(M?"":m)};return f<0?(d.push(b(1)),d.push(b(0))):d.push(b(f)),d}return[""]}function b(s){var f=s.split(",");return f.map(function(s){var f=s.replace(/&[ol]/,"");return G[f][0]}).join("的")}function h(f,m,b){if(b<0){var h=-1,o=-1;if(f.match(/^,w/)||f.match(/^,1/)?o=1:(f.match(/^,h/)||f.match(/^,0/))&&(o=0),m.match(/^,w/)||m.match(/^,1/)?h=1:(m.match(/^,h/)||m.match(/^,0/))&&(h=0),o==-1&&h>-1)b=h;else if(o>-1&&h==-1)b=o;else{if(o!=h)return!1;b=o}}var w=b,M=x(f,b),l=x(m,b),r=[];if(m){var e=!1,G=!1;l.forEach(function(s){s.match(/([fhs1](&[ol])?|[olx]b)$/)&&(e=!0),s.match(/([mwd0](&[ol])?|[olx]s)$/)&&(G=!0),r=r.concat(d(s,b))}),r=s(r),e&&G?w=-1:e?w=1:G&&(w=0)}else r=[""];var t=M.length>1?"["+M.join("|")+"]":M[0],n=r.length>1?"["+r.join("|")+"]":r[0];return{selector:(m?","+n:"")+(f?","+t:""),sex:w}}var o=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/^(.+)?,o([sb])([^#]+)&l/g,str:"$1,x$2$3"},{exp:/^(.+)?,l([sb])([^#]+)&o/g,str:"$1,x$2$3"},{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:Line truncated
"{M-1},f,ob,w":["叔兄妇"],"{M-1},f,lb":["叔弟"],"{M-1},f,lb,w":["叔弟妇"],"{M-1},f,xb,s":["叔男"],"{M-1},f,xb,d":["叔女"],"{M-1},f,os":["姑姊"],"{M-1},f,os,h":["姑姊婿"],"{M-1},f,ls":["姑妹"],"{M-1},f,ls,h":["姑妹婿"],"{M-1},f,xs,s":["姑男"],"{M-1},f,xs,d":["姑女"],"{M-1},m&o":["姊"],"{M-1},m&l":["妹"],"{M-1},m,f":["父"],"{M-1},m,f,f":["祖父"],"{M-1},m,f,m":["祖母"],"{M-1},m,m":["母"],"{M-1},m,m,f":["外祖父"],"{M-1},m,m,m":["外祖母"],"{M-1},m,ob":["舅兄"],"{M-1},m,ob,w":["舅兄妇"],"{M-1},m,lb":["舅弟"],"{M-1},m,lb,w":["舅弟妇"],"{M-1},m,xb,s":["舅男"],"{M-1},m,xb,d":["舅女"],"{M-1},m,os":["姨姊"],"{M-1},m,os,h":["姨姊婿"],"{M-1},m,ls":["姨妹"],"{M-1},m,ls,h":["姨妹婿"],"{M-1},m,xs,s":["姨男"],"{M-1},m,xs,d":["姨女"],"{M-1},xb":["男"],"{M-1},xb,w":["妇"],"{M-1},xb,s":["孙男"],"{M-1},xb,s,w":["孙妇"],"{M-1},xb,d":["孙女"],"{M-1},xb,d,h":["孙婿"],"{M-1},xs":["女"],"{M-1},xs,h":["婿"],"{M-1},xs,s":["外孙男"],"{M-1},xs,s,w":["外孙妇"],"{M-1},xs,d":["外孙女"],"{M-1},xs,d,h":["外孙婿"],"{M-2},f":["男"],"{M-2},f,f&o":["兄"],"{M-2},f,f&l":["弟"],"{M-2},f,m&o":["姊"],"{M-2},f,m&l":["妹"],"{M-2},m":["女"],"{M-2},m,f&o":["兄"],"{M-2},m,f&l":["弟"],"{M-2},m,m&o":["姊"],"{M-2},m,m&l":["妹"],"{M-2},xb":["孙男"],"{M-2},xb,w":["孙妇"],"{M-2},xs":["孙女"],"{M-2},xs,h":["孙婿"]},r={},e={},G={};for(var t in l){var n=t.match(/\{.+?\}/)[0],a=l[t];for(var c in M[n]){var p=M[n][c],i=t.replace(n,c),$=!1;["h,h","w,w","w,h","h,w"].forEach(function(s){i.indexOf(s)>-1&&($=!0)});var u=[];$||(p.forEach(function(s){a.forEach(function(f){f.indexOf("?")>-1?u.push(f.replace("?",s)):u.push(s+f)})}),r[i]=[].concat(r[i]||[],u))}}for(var t in w)r[t]=[].concat(w[t],r[t]||[]);var v={w:["内","岳","妻","丈人"],h:["外","夫"]};for(var t in r)if(0==t.indexOf("f")||0==t.indexOf("m"))for(var c in v){var i=c+","+t;r[i]||(r[i]=[]);var p=v[c],a=r[t];p.forEach(function(s){a.forEach(function(f){r[i].push(s+f)})})}G=Object.assign({},r);var W=function(o){var w=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default"},o);G=Object.assign({},r);for(var M in e)if(w.mode==M)for(var l in e[M])G[l]=[].concat(e[M][l],r[l]||[]);var t=f(w.text),n=f(w.target);n.length||(n=[""]);var a=[];return t.forEach(function(s){n.forEach(function(f){var o=h(s,f,w.sex),M=o?x(o.selector,o.sex):null;M&&M.forEach(function(s){var f=[s];"chain"==w.type?(w.reverse&&(f=d(s,o.sex)),f.forEach(function(s){var f=b(s);f&&a.push(f)})):(w.reverse&&(f=d(s,o.sex)),f.forEach(function(s){var f=m(o.sex+","+s);f.length||(f=m(s)),f.length&&(a=a.concat(f))}))})})}),s(a)};W.dataCount=0;for(var g in G)W.dataCount++;return W.setMode=function(s,f){"undefined"==typeof e[s]&&(e[s]={}),e[s]=Object.assign(e[s],f)},W});
!function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){function s(s){for(var f,x=[],m={},d=0;null!=(f=s[d]);d++){var b=f.replace(/[ol](?=s|b)/,"x").replace(/&[ol]/,"");b!=f||m[b]||(m[f]=!0)}for(var d=0;null!=(f=s[d]);d++){var b=f.replace(/[ol](?=s|b)/,"x").replace(/&[ol]/,"");b!=f?m[b]||x.indexOf(f)==-1&&x.push(f):x.indexOf(f)==-1&&x.push(f)}return x}function f(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x"),s=s.replace(/之/,"的").replace(/我的?(.+)/,"$1"),s.match(/[^娘婆亲]家的?/)&&(s=s.replace(/家的?/,"的"));for(var f=s.split("的"),x=[],m=!0,d={"哥":"兄","姐":"姊","侄":"姪","祖父":"王父","祖母":"王母","孙女婿":"孙婿","甥女婿":"甥婿","侄女婿":"侄婿","弟媳":"弟妇","孙媳妇":"孙妇","甥媳妇":"甥妇","侄媳妇":"侄妇"},b={"^表":["姑表","舅表"],"^姻":["姑姻","姨姻","姊妹姻","女姻"],"^眷":["叔眷","舅眷","兄弟眷","男眷"],"^外甥":["甥"],"^外表伯":["姑表伯外","舅表伯外"],"^外表叔":["姑表叔外","舅表叔外"],"^外表姑":["姑表姑外","舅表姑外"],"^外表舅":["姑表舅外","舅表舅外"],"^外表姨":["姑表姨外","舅表姨外"],"祖$":["祖父","祖母"],"孙$":["孙男","孙女"],"甥$":["甥男","甥女"],"侄$":["侄男","侄女"],"外甥$":["甥"],"嫂$":["兄妇"]};f.length;){var h=f.shift(),o=[],w=[h];for(var M in d){var l=h.replace(M,d[M]),r=h.replace(d[M],M);l!=h&&w.push(l),r!=h&&w.push(r)}var e=function(s){for(var f in b){var x=b[f];x.forEach(function(x){var m=s.replace(new RegExp(f),x);m!=s&&(w.push(m),e(m))})}};if(e(h),w.forEach(function(s){for(var f in G)G[f].indexOf(s)>-1&&o.push(f)}),!o.length)for(var t in G){var n=G[t];w.forEach(function(s){n.indexOf(s)>-1&&o.push(t)})}o.length||(m=!1);var a=[];x.length||(x=[""]),x.forEach(function(s){o.forEach(function(f){a.push(s+(f?","+f:""))})}),x=a}return m?x:[]}function x(f,x){var m=[],d={};x<0&&(f.match(/^,w/)?x=1:f.match(/^,h/)&&(x=0));var b=function(s,f){if(s.indexOf(",1")==-1&&s.indexOf(",0")==-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var x="";if(!d[s]){d[s]=!0;var h=!0;do{x=s;for(var w in o){var M=o[w];if(s=s.replace(M.exp,M.str),s.indexOf("#")>-1){for(var l=s.split("#"),r=0;r<l.length;r++)b(l[r]);h=!1;break}}}while(x!=s);if(h){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),m.push(s)}}};return x<0?(b(f,1),b(f,0)):b(f,x),s(m)}function m(s){var f=[],x=function(s){var f=[];if(G[s])f.push(G[s][0]);else for(var x in G)if(x.replace(/&[ol]/g,"")==s)f.push(G[x][0]);else for(var m=s;m.match(/[ol](b|s)/);)if(m=m.replace(/[ol](b|s)/,"x$1"),m==x){f.push(G[x][0]);break}return f};if(G[s])f.push(G[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 m=s.replace(/x/g,"l");f=x(m);var d=s.replace(/x/g,"o");f=f.concat(x(d))}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"]},m="";if(s.match(/&o$/)?m="&l":s.match(/&l$/)&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f<0&&(s.match(/^w/)?f=1:s.match(/^h/)&&(f=0));var d=[],b=function(f){var d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),h=d.split(",").reverse(),o=[],w=0;w<b.length;w++)o.push(x[b[w]][h[w]]);var M=0,l={f:1,m:1,s:-1,d:-1};return o.forEach(function(s){M+=l[s]||0}),o.join(",")+(M?"":m)};return f<0?(d.push(b(1)),d.push(b(0))):d.push(b(f)),d}return[""]}function b(s){var f=s.split(",");return f.map(function(s){var f=s.replace(/&[ol]/,"");return G[f][0]}).join("的")}function h(f,m,b){if(b<0){var h=-1,o=-1;if(f.match(/^,w/)||f.match(/^,1/)?o=1:(f.match(/^,h/)||f.match(/^,0/))&&(o=0),m.match(/^,w/)||m.match(/^,1/)?h=1:(m.match(/^,h/)||m.match(/^,0/))&&(h=0),o==-1&&h>-1)b=h;else if(o>-1&&h==-1)b=o;else{if(o!=h)return!1;b=o}}var w=b,M=x(f,b),l=x(m,b),r=[];if(m){var e=!1,G=!1;l.forEach(function(s){s.match(/([fhs1](&[ol])?|[olx]b)$/)&&(e=!0),s.match(/([mwd0](&[ol])?|[olx]s)$/)&&(G=!0),r=r.concat(d(s,b))}),r=s(r),e&&G?w=-1:e?w=1:G&&(w=0)}else r=[""];var t=M.length>1?"["+M.join("|")+"]":M[0],n=r.length>1?"["+r.join("|")+"]":r[0];return{selector:(m?","+n:"")+(f?","+t:""),sex:w}}var o=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/^(.+)?,o([sb])([^#]+)&l/g,str:"$1,x$2$3"},{exp:/^(.+)?,l([sb])([^#]+)&o/g,str:"$1,x$2$3"},{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]sLine truncated
"{M-1},f,m,m":["外祖母"],"{M-1},f,ob":["叔兄"],"{M-1},f,ob,w":["叔兄妇"],"{M-1},f,lb":["叔弟"],"{M-1},f,lb,w":["叔弟妇"],"{M-1},f,xb,s":["叔男"],"{M-1},f,xb,d":["叔女"],"{M-1},f,os":["姑姊"],"{M-1},f,os,h":["姑姊婿"],"{M-1},f,ls":["姑妹"],"{M-1},f,ls,h":["姑妹婿"],"{M-1},f,xs,s":["姑男"],"{M-1},f,xs,d":["姑女"],"{M-1},m&o":["姊"],"{M-1},m&l":["妹"],"{M-1},m,f":["父"],"{M-1},m,f,f":["祖父"],"{M-1},m,f,m":["祖母"],"{M-1},m,m":["母"],"{M-1},m,m,f":["外祖父"],"{M-1},m,m,m":["外祖母"],"{M-1},m,ob":["舅兄"],"{M-1},m,ob,w":["舅兄妇"],"{M-1},m,lb":["舅弟"],"{M-1},m,lb,w":["舅弟妇"],"{M-1},m,xb,s":["舅男"],"{M-1},m,xb,d":["舅女"],"{M-1},m,os":["姨姊"],"{M-1},m,os,h":["姨姊婿"],"{M-1},m,ls":["姨妹"],"{M-1},m,ls,h":["姨妹婿"],"{M-1},m,xs,s":["姨男"],"{M-1},m,xs,d":["姨女"],"{M-1},xb":["男"],"{M-1},xb,w":["妇"],"{M-1},xb,s":["孙男"],"{M-1},xb,s,w":["孙妇"],"{M-1},xb,d":["孙女"],"{M-1},xb,d,h":["孙婿"],"{M-1},xs":["女"],"{M-1},xs,h":["婿"],"{M-1},xs,s":["外孙男"],"{M-1},xs,s,w":["外孙妇"],"{M-1},xs,d":["外孙女"],"{M-1},xs,d,h":["外孙婿"],"{M-2},f":["男"],"{M-2},f,f&o":["兄"],"{M-2},f,f&l":["弟"],"{M-2},f,m&o":["姊"],"{M-2},f,m&l":["妹"],"{M-2},m":["女"],"{M-2},m,f&o":["兄"],"{M-2},m,f&l":["弟"],"{M-2},m,m&o":["姊"],"{M-2},m,m&l":["妹"],"{M-2},xb":["孙男"],"{M-2},xb,w":["孙妇"],"{M-2},xs":["孙女"],"{M-2},xs,h":["孙婿"]},r={},e={},G={};for(var t in l){var n=t.match(/\{.+?\}/)[0],a=l[t];for(var c in M[n]){var p=M[n][c],i=t.replace(n,c),$=!1;["h,h","w,w","w,h","h,w"].forEach(function(s){i.indexOf(s)>-1&&($=!0)});var u=[];$||(p.forEach(function(s){a.forEach(function(f){f.indexOf("?")>-1?u.push(f.replace("?",s)):u.push(s+f)})}),r[i]=[].concat(r[i]||[],u))}}for(var t in w)r[t]=[].concat(w[t],r[t]||[]);var v={w:["内","岳","妻","丈人"],h:["外","夫"]};for(var t in r)if(0==t.indexOf("f")||0==t.indexOf("m"))for(var c in v){var i=c+","+t;r[i]||(r[i]=[]);var p=v[c],a=r[t];p.forEach(function(s){a.forEach(function(f){r[i].push(s+f)})})}G=Object.assign({},r);var W=function(o){var w=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default"},o);G=Object.assign({},r);for(var M in e)if(w.mode==M)for(var l in e[M])G[l]=[].concat(e[M][l],r[l]||[]);var t=f(w.text),n=f(w.target);n.length||(n=[""]);var a=[];return t.forEach(function(s){n.forEach(function(f){var o=h(s,f,w.sex),M=o?x(o.selector,o.sex):null;M&&M.forEach(function(s){var f=[s];"chain"==w.type?(w.reverse&&(f=d(s,o.sex)),f.forEach(function(s){var f=b(s);f&&a.push(f)})):(w.reverse&&(f=d(s,o.sex)),f.forEach(function(s){var f=m(o.sex+","+s);f.length||(f=m(s)),f.length&&(a=a.concat(f))}))})})}),s(a)};W.dataCount=0;for(var g in G)W.dataCount++;return W.setMode=function(s,f){"undefined"==typeof e[s]&&(e[s]={}),e[s]=Object.assign(e[s],f)},W});
script/relationship.js
+15 -11
View File
@@ -807,7 +807,7 @@
'm,m,{G1M},w':['?外曾外祖母','外曾外?祖母','?外太外婆','外太外?婆','外太外?奶','?外太外奶','?外太外奶奶','外太外?奶奶'],
'm,m,{G1W}':['?外曾外祖母','外曾外?祖母','?外太外婆','外太外?婆','外太外?奶','?外太外奶','?外太外奶奶','外太外?奶奶'],
'm,m,{G1W},h':['?外曾外祖父','外曾外?祖父','?外太外公','外太外?公','外太外?爷','?外太外爷','?外太外爷爷','外太?外爷爷'],
'f,{G1M}':['公','祖父','奶爷','爷'],
'f,{G1M}':['公','祖父','奶爷','爷爷','老爷','爷'],
'f,{G1M},w':['婆','祖母','奶奶','奶'],
'f,{G1W}':['婆','祖母','奶奶','奶'],
'f,{G1W},h':['公','祖父','奶爷','爷'],
@@ -1365,16 +1365,20 @@
var items = [];
var getData = function(d){
var res = [];
for(var i in _data){
if(i.replace(/&[ol]/g,'')==d){
res.push(_data[i][0]);
}else{
var expr = d;
while (expr.match(/[ol](b|s)/)){
expr = expr.replace(/[ol](b|s)/,'x$1');
if(expr==i){
res.push(_data[i][0]);
break;
if(_data[d]){
res.push(_data[d][0]);
}else{
for(var i in _data){
if(i.replace(/&[ol]/g,'')==d){
res.push(_data[i][0]);
}else{
var expr = d;
while (expr.match(/[ol](b|s)/)){
expr = expr.replace(/[ol](b|s)/,'x$1');
if(expr==i){
res.push(_data[i][0]);
break;
}
}
}
}