updated 离孙、归孙理解错误修复
This commit is contained in:
parent
f86ccd5eae
commit
bb557717e4
2
dist/relationship.min.js
vendored
2
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
2
dist/relationship.zh-HK.min.js
vendored
2
dist/relationship.zh-HK.min.js
vendored
File diff suppressed because one or more lines are too long
@ -305,9 +305,9 @@
|
|||||||
'[f,xs|m,xb],s,d':['姑舅女儿'],
|
'[f,xs|m,xb],s,d':['姑舅女儿'],
|
||||||
'[xb|xs],[s|d]':['侄甥'],
|
'[xb|xs],[s|d]':['侄甥'],
|
||||||
'xb,[s|d]':['侄子女','侄子侄女'],
|
'xb,[s|d]':['侄子女','侄子侄女'],
|
||||||
'xb,[s|d],[s|d]':['归孙'],
|
|
||||||
'xs,[s|d]':['甥子女','外甥子女'],
|
'xs,[s|d]':['甥子女','外甥子女'],
|
||||||
'xs,[s|d],[s|d]':['离孙'],
|
'0,xb,[s|d],[s|d]':['归孙'],
|
||||||
|
'h,xs,[s|d],[s|d]':['离孙'],
|
||||||
'[w|s|d]':['妻儿'],
|
'[w|s|d]':['妻儿'],
|
||||||
'[s|d]':['子女','儿女','小孩','孩子','孩子们','孩儿','小孩儿','宝宝','宝贝','娃','儿辈','子辈','子息','子嗣','崽','幺儿'],
|
'[s|d]':['子女','儿女','小孩','孩子','孩子们','孩儿','小孩儿','宝宝','宝贝','娃','儿辈','子辈','子息','子嗣','崽','幺儿'],
|
||||||
'[s|d],[s|d]':['孙辈'],
|
'[s|d],[s|d]':['孙辈'],
|
||||||
@ -774,7 +774,7 @@
|
|||||||
'f,xb':['堂','同堂','亲堂','从父','叔伯','从'],
|
'f,xb':['堂','同堂','亲堂','从父','叔伯','从'],
|
||||||
'f,xs':['姑表','姑家'],
|
'f,xs':['姑表','姑家'],
|
||||||
'm,xb':['舅表','舅家'],
|
'm,xb':['舅表','舅家'],
|
||||||
'm,xs':['姨','从母','姨家','从'],
|
'm,xs':['姨','从母','姨家','两姨','从'],
|
||||||
'f,f,xb,s':['从堂','再从父','远堂','堂叔伯','叔伯叔伯','再从'],
|
'f,f,xb,s':['从堂','再从父','远堂','堂叔伯','叔伯叔伯','再从'],
|
||||||
'f,f,xb,d':['堂姑表','从父姑表'],
|
'f,f,xb,d':['堂姑表','从父姑表'],
|
||||||
'f,f,xs,s':['姑表叔表'],
|
'f,f,xs,s':['姑表叔表'],
|
||||||
@ -2076,6 +2076,13 @@
|
|||||||
temps.forEach(function(id){
|
temps.forEach(function(id){
|
||||||
var item = getChainById(id);
|
var item = getChainById(id);
|
||||||
if(item){
|
if(item){
|
||||||
|
if(id.match(/^[^hw]/)){
|
||||||
|
if(data['sex']==0){
|
||||||
|
item = '(女性)'+item;
|
||||||
|
}else if(data['sex']==1){
|
||||||
|
item = '(男性)'+item;
|
||||||
|
}
|
||||||
|
}
|
||||||
result.push(item);
|
result.push(item);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user