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

updated 两者组合查询时性别判断优化

Browse Source
This commit is contained in:
mumuy 2022-02-18 18:35:48 +08:00
parent ef1131f034
commit 6f967a8ad6
4 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
index.html
View File

@ -16,7 +16,7 @@
<script type="text/javascript">
setTimeout(function(){
if(location.hostname.indexOf('passer-by.com')==-1){
location.href = 'http://passer-by.com/';
// location.href = 'http://passer-by.com/';
}else if( window.top != window.self ) {
window.top.location = self.location.href;
}

61
script/relationship.js
View File

@ -205,7 +205,7 @@
'[f,xs,d&o|f,xs,d&l|m,xb,d&o|m,xb,d&l]':['表姐妹'],
'[ob|os]':['哥哥姐姐'],
'[lb|ls]':['弟弟妹妹'],
'[s|d]':['子女','儿女','小孩','孩子','孩儿','宝宝','宝贝','娃','儿辈','子辈'],
'[s|d]':['子女','儿女','小孩','孩子','孩子们','孩儿','宝宝','宝贝','娃','儿辈','子辈'],
'[s,s|s,d|d,s|d,d]':['孙辈'],
'[s|d|s,s|s,d|d,s|d,d]':['儿孙','子孙'],
// 本家
@ -2605,42 +2605,61 @@
// 合并选择器，查找两个对象之间的关系
function mergeSelector(from,to,my_sex){
if(my_sex<0){
if(from.match(/^,w/)||from.match(/^,1/)||to.match(/^,w/)||to.match(/^,1/)){
my_sex = 1;
}else if(from.match(/^,h/)||from.match(/^,0/)||to.match(/^,h/)||to.match(/^,0/)){
my_sex = 0;
var to_sex = -1;
var from_sex = -1;
if(from.match(/^,w/)||from.match(/^,1/)){
from_sex = 1;
}
if(from.match(/^,h/)||from.match(/^,0/)){
from_sex = 0;
}
if(to.match(/^,w/)||to.match(/^,1/)){
to_sex = 1;
}
if(to.match(/^,h/)||to.match(/^,0/)){
to_sex = 0;
}
if(from_sex==-1&&to_sex>-1){
my_sex = to_sex;
}else if(from_sex>-1&&to_sex==-1){
my_sex = from_sex;
}else if(from_sex==to_sex){
my_sex = from_sex;
}else{
return false;
}
}
var sex = my_sex;
var from_ids = selector2id(from,my_sex);
var to_ids = selector2id(to,my_sex);
var r_ids = [];
var from_rids = [];
var to_rids = [];
if(to){
var isMale = false;
var isFemale = false;
var toIsMale = false;
var toIsFemale = false;
to_ids.forEach(function(id){
if(id.match(/([fhs1](&[ol])?|[olx]b)$/)){
isMale = true;
toIsMale = true;
}
if(id.match(/([mwd0](&[ol])?|[olx]s)$/)){
isFemale = true;
toIsFemale = true;
}
r_ids = r_ids.concat(reverseId(id,my_sex));
to_rids = to_rids.concat(reverseId(id,my_sex));
});
r_ids = unique(r_ids);
if(isMale&&isFemale){
to_rids = unique(to_rids);
if(toIsMale&&toIsFemale){
sex = -1;
}else if(isMale){
}else if(toIsMale){
sex = 1;
}else if(isFemale){
}else if(toIsFemale){
sex = 0;
}
}else{
r_ids = [''];
to_rids = [''];
}
// console.log('[from_ids]',from_ids,'r_ids',r_ids);
// console.log('[from_ids]',from_ids,'to_rids',to_rids);
var from_selector = from_ids.length>1?'['+from_ids.join('|')+']':from_ids[0];
var to_selector = r_ids.length>1?'['+r_ids.join('|')+']':r_ids[0];
var to_selector = to_rids.length>1?'['+to_rids.join('|')+']':to_rids[0];
return {
'selector':(to?','+to_selector:'')+(from?','+from_selector:''),
'sex':sex
@ -2669,13 +2688,13 @@
if(!to_selectors.length){
to_selectors = [''];
}
console.log('[selectors]',from_selectors,to_selectors);
// console.log('[selectors]',from_selectors,to_selectors);
var result = []; //匹配结果
from_selectors.forEach(function(from){
to_selectors.forEach(function(to){
var data = mergeSelector(from,to,options.sex);
console.log('[data]',data);
var ids = selector2id(data['selector'],data['sex']);
// console.log('[data]',from,to,data);
var ids = data?selector2id(data['selector'],data['sex']):null;
// console.log('[ids]',data['selector'],data['sex'],ids);
if(ids){
ids.forEach(function(id){

2
test/index.js
View File

@ -25,6 +25,6 @@ test('relationship.js show to be tested', function (t) {
t.deepEqual(relationship({text:'爸爸的哥哥的弟弟的儿子'}),['堂哥','堂弟','兄弟','自己']);
t.deepEqual(relationship({text:'外婆',target:'女婿',reverse:true}),['外曾孙女婿','外曾外孙女婿']);
t.deepEqual(relationship({text:'我',target:'爸爸'}),['儿子','女儿']);
t.deepEqual(relationship({text:'爱人',target:'娘家侄子'}),['姑丈']);
t.end();
});