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 2021-11-26 07:35:09 +08:00
parent 128eb45f46
commit 6bc22e041a
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
script/index.js
View File

@ -137,14 +137,21 @@ relationship.setMode('cantonese',{
}; };
var bindChange = function(){ var bindChange = function(){
var value = $input.value.trim(); var value = $input.value.trim();
var result = relationship({text:value,type:'chain'}); var sex = $sex[0].checked?1:0;
if(result.length){ var mode = $mode[0].checked?$mode[0].value:$mode[1].value;
var name = result[0].split('的').pop(); var reverse = !$reverse[0].checked;
if(!name){ if(value){
toggleSex($sex[0].checked); var result = relationship({text:value,sex:sex,reverse:reverse,mode:mode});
}else{ if(result.length){
toggleSex('爸爸,老公,儿子,哥哥,弟弟,兄弟'.indexOf(name)>-1); var name = result[0].split('的').pop();
if(!name){
toggleSex($sex[0].checked);
}else{
toggleSex('爸爸,老公,儿子,哥哥,弟弟,兄弟'.indexOf(name)>-1);
}
} }
}else{
$result.value = '';
} }
}; };

9
script/relationship.js
View File

@ -173,11 +173,11 @@
exp:/,w,h|,h,w/g, exp:/,w,h|,h,w/g,
str:'' str:''
}, },
{//并列关系处理1 {//并列关系处理1 X[A|B|C]Y = XAY#X[B|C]Y
exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)\](.+)?/g, exp:/(.+)?\[([^\|]+?)\|([^\[\]]*\|[^\[\]]*)\](.+)?/g,
str:'$1$2$4#$1[$3]$4' str:'$1$2$4#$1[$3]$4'
}, },
{//并列关系处理2 {//并列关系处理2 X[A|B]Y = XAY#XBY
exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g, exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g,
str:'$1$2$4#$1$3$4' str:'$1$2$4#$1$3$4'
} }
@ -2488,7 +2488,10 @@
}else if(isFemale){ }else if(isFemale){
sex = 0; sex = 0;
} }
}else{
r_ids = [''];
} }
// console.log('[from_ids]',from_ids,'r_ids',r_ids);
var from_selector = from_ids.length>1?'['+from_ids.join('|')+']':from_ids[0]; 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 = r_ids.length>1?'['+r_ids.join('|')+']':r_ids[0];
return { return {

2
test/index.js
View File

@ -22,5 +22,7 @@ test('relationship.js show to be tested', function (t) {
t.deepEqual(relationship({text:'姑妈',target:'舅妈',reverse:true}),['兄弟眷兄妇','兄弟眷弟妇']); t.deepEqual(relationship({text:'姑妈',target:'舅妈',reverse:true}),['兄弟眷兄妇','兄弟眷弟妇']);
t.deepEqual(relationship({text:'舅妈',target:'女儿',reverse:true}),['姑甥孙女','姑甥外孙女']); t.deepEqual(relationship({text:'舅妈',target:'女儿',reverse:true}),['姑甥孙女','姑甥外孙女']);
t.deepEqual(relationship({text:'老公的父母',target:'孩子'}),['爷爷','奶奶']); t.deepEqual(relationship({text:'老公的父母',target:'孩子'}),['爷爷','奶奶']);
t.deepEqual(relationship({text:'爸爸的哥哥的弟弟的儿子'}),['堂哥','堂弟','兄弟','自己']);
t.end(); t.end();
}); });