diff --git a/dist/relationship.js b/dist/relationship.js index ff3e78d..327b8e9 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -624,16 +624,16 @@ 'f,ob,w':['伯母','伯妈','伯娘','大娘','大妈','x妈'], 'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小爹','小爸','幺爸','x叔','叔'], 'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','婶子','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','幺婶','x婶','婶'], - 'f,xb,w,f':['叔姻外祖父','姻伯公'], - 'f,xb,w,m':['叔姻外祖母','姻伯婆'], + 'f,xb,w,f':['叔姻外祖父','叔眷毑父','眷爷爷'], + 'f,xb,w,m':['叔姻外祖母','叔眷毑母','眷姥姥'], 'f,xb,w,xb':['叔姻舅父','姻舅父'], 'f,xb,w,xb,w':['叔姻舅母','姻舅母'], 'f,xb,w,xs':['叔姻姨母','姻姨母'], 'f,xb,w,xs,h':['叔姻姨父','姻姨父'], 'f,xb,s&o':['堂哥','堂兄','堂阿哥','从父兄','叔伯兄','从兄'], - 'f,xb,s&o,w':['堂嫂'], + 'f,xb,s&o,w':['堂嫂','从父兄妇','叔伯兄妇'], 'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'], - 'f,xb,s&l,w':['堂弟媳','堂弟妹'], + 'f,xb,s&l,w':['堂弟媳','堂弟妹','从父弟妇','叔伯弟妇'], 'f,xb,s,s':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'], 'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'], 'f,xb,s,s,s':['堂侄孙男'], @@ -643,9 +643,9 @@ 'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'], 'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'], 'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'], - 'f,xb,d&o,h':['堂姐夫'], + 'f,xb,d&o,h':['堂姐夫','从父姊夫','从父姊婿','叔伯姊夫'], 'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'], - 'f,xb,d&l,h':['堂妹夫'], + 'f,xb,d&l,h':['堂妹夫','从父妹夫','从父妹婿','叔伯妹夫'], 'f,xb,d,s':['堂甥男','堂甥'], 'f,xb,d,s,w':['堂甥妇'], 'f,xb,d,d':['堂甥女','堂甥'], @@ -655,8 +655,8 @@ 'f,ls':['姑妈','姑姐'], 'f,xs':['姑妈','姑姑','姑娘','大姑妈','姑','x姑妈'], 'f,xs,h':['姑丈','姑父','姑爸','姑夫','x姑丈','x姑父'], - 'f,xs,h,f':['姑姻伯公','姻伯公'], - 'f,xs,h,m':['姑姻伯婆','姻伯婆'], + 'f,xs,h,f':['姑姻祖母','姻奶奶'], + 'f,xs,h,m':['姑姻祖父','姻爷爷'], 'f,xs,h,ob':['姑姻伯父','姻伯父','姻世伯'], 'f,xs,h,ob,w':['姑姻伯母','姻伯母'], 'f,xs,h,lb':['姑姻叔父','姻叔父'], @@ -664,9 +664,9 @@ 'f,xs,h,xs':['姑姻姑母','姻姑母'], 'f,xs,h,xs,h':['姑姻姑父','姻姑父'], 'f,xs,s&o':['姑表哥','姑表兄','表哥','表兄'], - 'f,xs,s&o,w':['姑表嫂','表嫂'], + 'f,xs,s&o,w':['姑表嫂','姑表兄妇','表嫂'], 'f,xs,s&l':['姑表弟','表弟'], - 'f,xs,s&l,w':['姑表弟妇','表弟妇','表弟妹'], + 'f,xs,s&l,w':['姑表弟妇','姑表弟妇','表弟妇','表弟妹'], 'f,xs,s,s':['姑表侄男','表侄男','表侄'], 'f,xs,s,s,w':['姑表侄妇','表侄妇'], 'f,xs,s,s,s':['姑表侄孙男','姑表侄孙','表侄孙'], @@ -680,9 +680,9 @@ 'f,xs,s,d,d':['姑表侄孙女'], 'f,xs,s,d,d,h':['姑表侄孙婿'], 'f,xs,d&o':['姑表姐','姑表姊','表姐','表姊'], - 'f,xs,d&o,h':['姑表姐夫','姑表姊夫','表姐夫','表姊夫','表姐丈','表姊丈'], + 'f,xs,d&o,h':['姑表姐夫','姑表姊夫','姑表姊婿','表姐夫','表姊夫','表姐丈','表姊丈'], 'f,xs,d&l':['姑表妹','表妹'], - 'f,xs,d&l,h':['姑表妹夫','表妹夫'], + 'f,xs,d&l,h':['姑表妹夫','姑表妹婿','表妹夫'], 'f,xs,d,s':['姑表甥男','表甥男','表外甥'], 'f,xs,d,s,s':['姑表甥孙男','表甥孙男'], 'f,xs,d,s,d':['姑表甥孙女','表甥孙女'], @@ -997,17 +997,17 @@ 'm,m,xs,d,d,d,h':['再从母甥婿'], // 舅表 'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','阿舅','x舅'], - 'm,xb,w':['舅妈','舅母','妗子','妗妗','妗母','阿妗','x舅妈'], - 'm,xb,w,f':['舅姻外祖父','姻伯公'], - 'm,xb,w,m':['舅姻外祖母','姻伯婆'], + 'm,xb,w':['舅妈','舅母','妗子','妗妗','妗妈','妗母','阿妗','x舅妈'], + 'm,xb,w,f':['舅姻外祖父','舅眷毑父','眷爷爷'], + 'm,xb,w,m':['舅姻外祖母','舅眷毑母','眷姥姥'], 'm,xb,w,xb':['舅姻舅父','姻舅父'], 'm,xb,w,xb,w':['舅姻舅母','姻舅母'], 'm,xb,w,xs':['舅姻姨母','姻姨母'], 'm,xb,w,xs,h':['舅姻姨父','姻姨父'], 'm,xb,s&o':['舅表哥','舅表兄','表哥','表兄'], - 'm,xb,s&o,w':['舅表嫂','表嫂'], + 'm,xb,s&o,w':['舅表嫂','舅表兄妇','表嫂'], 'm,xb,s&l':['舅表弟','表弟'], - 'm,xb,s&l,w':['舅表弟媳','表弟媳','表弟妹'], + 'm,xb,s&l,w':['舅表弟媳','舅表弟妇','表弟媳','表弟妹'], 'm,xb,s,s':['舅表侄男','表侄男','表侄'], 'm,xb,s,s,w':['舅表侄妇','表侄妇'], 'm,xb,s,s,s':['舅表侄孙男','舅表侄孙','表侄孙'], @@ -1021,9 +1021,9 @@ 'm,xb,s,d,d':['舅表侄孙女'], 'm,xb,s,d,d,h':['舅表侄孙婿'], 'm,xb,d&o':['舅表姐','舅表姊','表姐','表姊'], - 'm,xb,d&o,h':['舅表姐夫','舅表姊夫','表姐夫','表姐姊','表姐丈','表姊丈'], + 'm,xb,d&o,h':['舅表姐夫','舅表姊夫','舅表姊婿','表姐夫','表姐姊','表姐丈','表姊丈'], 'm,xb,d&l':['舅表妹','表妹'], - 'm,xb,d&l,h':['舅表妹夫','表妹夫'], + 'm,xb,d&l,h':['舅表妹夫','舅表妹婿','表妹夫'], 'm,xb,d,s':['舅表甥男','表外甥','表甥男'], 'm,xb,d,s,s':['舅表甥孙男','表甥孙男'], 'm,xb,d,s,d':['舅表甥孙女','表甥孙女'], @@ -1040,9 +1040,9 @@ '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':['姨丈','姨父','姨爸','姨爹','姨婿','姨郎','x姨丈','x姨父'], + 'm,xs,h,f':['姨姻祖父','姻爷爷'], + 'm,xs,h,m':['姨姻祖母','姻奶奶'], 'm,xs,h,ob':['姨姻伯父','姻伯父','姻世伯'], 'm,xs,h,ob,w':['姨姻伯母','姻伯母'], 'm,xs,h,lb':['姨姻叔父','姻叔父'], @@ -1058,7 +1058,7 @@ 'm,xs,s,d':['姨侄女','从母侄女','姨侄'], 'm,xs,s,d,h':['姨侄婿','从母侄婿'], 'm,xs,d&o':['姨姐','姨姊','从母姐','从母姊'], - 'm,xs,d&o,h':['姨姐夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'], + 'm,xs,d&o,h':['姨姐夫','姨姊夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'], 'm,xs,d&l':['姨妹','从母妹'], 'm,xs,d&l,h':['姨妹夫','从母妹夫','从母妹丈','从母妹婿','从母妹郎'], 'm,xs,d,s':['姨甥男','从母甥男','姨外甥','姨甥'], @@ -1094,34 +1094,34 @@ 'h,f,ob,w':['伯婆母','伯婆'], 'h,f,lb':['叔公父','叔公','叔翁','叔祖'], 'h,f,lb,w':['叔婆母','叔婆','婶婆','婶亲'], - 'h,f,xb,s&o':['堂大伯子','从父大伯子','堂大伯','从父大伯','夫从兄'], + '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&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':['姑表大伯子','姑表大伯兄','表大伯'], '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&o':['姑表大姑姐','姑表大姑姊','表大姑'], + 'h,f,xs,d&o,h':['姑表大姑姐夫','姑表大姑姊夫'], 'h,f,xs,d&l':['姑表小姑妹','表姑仔'], 'h,f,xs,d&l,h':['姑表小姑妹夫'], 'h,f,xs,d,s':['姑表夫甥男'], 'h,f,xs,d,d':['姑表夫甥女'], 'h,m':['婆婆','婆母','姑亲','老婆婆'], - 'h,m,f':['外祖公','姥公父'], + 'h,m,f':['外祖公','姥公父','姥公'], 'h,m,f,f':['外曾祖公'], 'h,m,f,m':['外曾祖婆'], 'h,m,f,ob':['伯外祖公'], @@ -1130,7 +1130,7 @@ 'h,m,f,lb,w':['叔外祖婆'], 'h,m,f,xs':['姑外祖婆'], 'h,m,f,xs,h':['姑外祖公'], - 'h,m,m':['外祖婆','姥婆母'], + 'h,m,m':['外祖婆','姥婆母','姥婆'], 'h,m,m,f':['外曾外祖公'], 'h,m,m,m':['外曾外祖婆'], 'h,m,m,xb':['舅外祖公'], @@ -1139,28 +1139,28 @@ 'h,m,m,xs,h':['姨外祖公'], 'h,m,xb':['舅公父','舅公'], 'h,m,xb,w':['舅婆母','舅婆'], - 'h,m,xb,s&o':['舅表大伯子','表大伯'], + 'h,m,xb,s&o':['舅表大伯子','舅表大伯兄','表大伯'], 'h,m,xb,s&o,w':['舅表大伯嫂','表大姆'], 'h,m,xb,s&l':['舅表小叔弟','表叔仔'], 'h,m,xb,s&l,w':['舅表小叔弟妇','表小弟'], 'h,m,xb,s,s':['舅表夫侄男'], 'h,m,xb,s,d':['舅表夫侄女'], - 'h,m,xb,d&o':['舅表大姑姐','表大姑'], - 'h,m,xb,d&o,h':['舅表大姑姐夫'], + 'h,m,xb,d&o':['舅表大姑姐','舅表大姑姊','表大姑'], + 'h,m,xb,d&o,h':['舅表大姑姐夫','舅表大姑姊夫'], 'h,m,xb,d&l':['舅表小姑妹','表姑仔'], 'h,m,xb,d&l,h':['舅表小姑妹夫'], 'h,m,xb,d,s':['舅表夫甥男'], 'h,m,xb,d,d':['舅表夫甥女'], 'h,m,xs':['姨婆母','姨婆'], 'h,m,xs,h':['姨公父','姨公'], - 'h,m,xs,s&o':['姨大伯子','从母大伯子','姨大伯','从母大伯'], + 'h,m,xs,s&o':['姨大伯子','从母大伯子','从母大伯兄','姨大伯','从母大伯'], 'h,m,xs,s&o,w':['姨大伯嫂','从母大伯嫂','姨大姆','从母大姆'], 'h,m,xs,s&l':['姨小叔弟','从母小叔弟','姨叔仔','从母叔仔'], 'h,m,xs,s&l,w':['姨小叔弟妇','从母小叔弟妇','姨小弟','从母小弟'], 'h,m,xs,s,s':['姨夫侄男','从母夫侄男'], 'h,m,xs,s,d':['姨夫侄女','从母夫侄女'], - 'h,m,xs,d&o':['姨大姑姐','从母大姑姐'], - 'h,m,xs,d&o,h':['姨大姑姐夫','从母大姑姐夫'], + 'h,m,xs,d&o':['姨大姑姐','从母大姑姊','从母大姑姐'], + 'h,m,xs,d&o,h':['姨大姑姐夫','从母大姑姊夫','从母大姑姐夫'], 'h,m,xs,d&l':['姨小姑妹','从母小姑妹'], 'h,m,xs,d&l,h':['姨小姑妹夫','从母小姑妹夫'], 'h,m,xs,d,s':['姨夫甥男','从母夫甥男'], @@ -1171,7 +1171,7 @@ 'h,lb,w':['小婶子','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'], 'h,xb':['伯叔'], 'h,xb,s':['婆家侄','叔侄男','叔伯男','从男','婆家侄男'], - 'h,xb,s,w':['叔侄媳妇','叔侄妇'], + 'h,xb,s,w':['叔侄媳妇','叔伯侄妇','叔伯妇','叔侄妇'], 'h,xb,s,s':['叔侄孙男'], 'h,xb,s,s,w':['叔侄孙妇'], 'h,xb,s,d':['叔侄孙女'], @@ -1187,7 +1187,7 @@ 'h,ls':['小姑子','小姑','小姑妹','姑仔','夫妹'], 'h,ls,h':['小姑夫','小亘子','小姑妹夫'], 'h,xs,s':['姑甥男','姑男','婆家甥男'], - 'h,xs,s,w':['姑甥妇'], + 'h,xs,s,w':['姑甥妇','姑妇'], 'h,xs,s,s':['姑甥孙男'], 'h,xs,s,s,w':['姑甥孙妇'], 'h,xs,s,d':['姑甥孙女'], @@ -1248,7 +1248,7 @@ 'w,f,xs,d&l':['姑表小姨妹','表姨仔','表内妹'], 'w,f,xs,d&l,h':['姑表襟弟','表襟弟'], 'w,m':['岳母','丈母娘','老丈母','丈母','泰水'], - 'w,m,f':['外祖岳父','外太岳父','姥岳父'], + 'w,m,f':['外祖岳父','外太岳父','姥岳父','姥丈人'], 'w,m,f,f':['外曾祖丈人'], 'w,m,f,m':['外曾祖丈母'], 'w,m,f,ob':['伯外祖岳父'], @@ -1257,7 +1257,7 @@ 'w,m,f,lb,w':['叔外祖岳母'], 'w,m,f,xs':['姑外祖岳母'], 'w,m,f,xs,h':['姑外祖岳父'], - 'w,m,m':['外祖岳母','外太岳母','姥岳母'], + 'w,m,m':['外祖岳母','外太岳母','姥岳母','姥丈母'], 'w,m,m,f':['外曾外祖丈人'], 'w,m,m,m':['外曾外祖丈母'], 'w,m,m,xb':['舅外祖岳父'], @@ -1289,7 +1289,7 @@ 'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅','舅弟'], 'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'], 'w,xb,s':['内侄','内侄男','妻侄男','舅侄男','岳侄男','丈人侄男','舅男'], - 'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇'], + 'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇','舅妇'], 'w,xb,s,s':['内侄孙','内侄孙男','妻侄孙男'], 'w,xb,s,s,w':['内侄孙妇','妻侄孙妇'], 'w,xb,s,s,s':['内曾侄孙','内曾侄孙男'], @@ -1309,7 +1309,7 @@ 'w,ls':['小姨子','小姨妹','妻妹','小妹儿'], 'w,ls,h':['小姨夫','小姨妹夫','襟弟','连襟','连桥','姨夫'], 'w,xs,s':['内甥男','内甥','妻甥男','姨甥男','岳甥男','丈人甥男','姨男','从男'], - 'w,xs,s,w':['内甥妇','姨甥妇','姨甥妇','岳甥妇','丈人甥妇'], + 'w,xs,s,w':['内甥妇','姨甥妇','岳甥妇','丈人甥妇','姨妇'], 'w,xs,s,s':['内甥孙男','姨甥孙男'], 'w,xs,s,s,w':['内甥孙妇','姨甥孙妇'], 'w,xs,s,d':['内甥孙女','姨甥孙女'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index ad739e1..1f43a82 100644 --- a/dist/relationship.min.js +++ b/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=[],m=!0;f.length;){var d=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(d)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var d=function(s){var f="";if(!m[s]){m[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-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;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(),w=d.split(",").reverse(),h=[],l=0;l-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var d=function(s){var f="";if(!m[s]){m[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-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;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(),w=d.split(",").reverse(),h=[],l=0;l 中国亲戚关系计算器 - +