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

修复正则匹配bug

Browse Source
This commit is contained in:
PASSER-BY 2021-11-11 00:26:23 +08:00
parent cd06399c7a
commit c8269b5770
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/relationship.js vendored
View File

@ -166,7 +166,7 @@
str:'' str:''
}, },
{//并列关系处理1 {//并列关系处理1
exp:/(.+)?\[([^\|]+?)\|(.+?\|.+?)?\](.+)?/g, exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)?\](.+)?/g,
str:'$1$2$4#$1[$3]$4' str:'$1$2$4#$1[$3]$4'
}, },
{//并列关系处理2 {//并列关系处理2
@ -634,14 +634,14 @@
'f,xb,s&o,w':['堂嫂'], 'f,xb,s&o,w':['堂嫂'],
'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'], 'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'],
'f,xb,s&l,w':['堂弟媳','堂弟妹'], 'f,xb,s&l,w':['堂弟媳','堂弟妹'],
'f,xb,s,s':['堂侄男','堂侄子','从父侄男','叔伯侄男','堂侄'], 'f,xb,s,s':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'],
'f,xb,s,s,w':['堂侄妇','从父侄妇','叔伯侄父'], 'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'],
'f,xb,s,s,s':['堂侄孙男'], 'f,xb,s,s,s':['堂侄孙男'],
'f,xb,s,s,s,w':['堂侄孙妇'], 'f,xb,s,s,s,w':['堂侄孙妇'],
'f,xb,s,s,d':['堂侄孙女'], 'f,xb,s,s,d':['堂侄孙女'],
'f,xb,s,s,d,h':['堂侄孙婿'], 'f,xb,s,s,d,h':['堂侄孙婿'],
'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'], 'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'],
'f,xb,s,d,h':['堂侄婿','从父侄婿','叔伯侄婿'], 'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'],
'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'], 'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'],
'f,xb,d&o,h':['堂姐夫'], 'f,xb,d&o,h':['堂姐夫'],
'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'], 'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'],

4
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
script/relationship.js
View File

@ -166,7 +166,7 @@
str:'' str:''
}, },
{//并列关系处理1 {//并列关系处理1
exp:/(.+)?\[([^\|]+?)\|(.+?\|.+?)?\](.+)?/g, exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)?\](.+)?/g,
str:'$1$2$4#$1[$3]$4' str:'$1$2$4#$1[$3]$4'
}, },
{//并列关系处理2 {//并列关系处理2
@ -634,14 +634,14 @@
'f,xb,s&o,w':['堂嫂'], 'f,xb,s&o,w':['堂嫂'],
'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'], 'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'],
'f,xb,s&l,w':['堂弟媳','堂弟妹'], 'f,xb,s&l,w':['堂弟媳','堂弟妹'],
'f,xb,s,s':['堂侄男','堂侄子','从父侄男','叔伯侄男','堂侄'], 'f,xb,s,s':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'],
'f,xb,s,s,w':['堂侄妇','从父侄妇','叔伯侄父'], 'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'],
'f,xb,s,s,s':['堂侄孙男'], 'f,xb,s,s,s':['堂侄孙男'],
'f,xb,s,s,s,w':['堂侄孙妇'], 'f,xb,s,s,s,w':['堂侄孙妇'],
'f,xb,s,s,d':['堂侄孙女'], 'f,xb,s,s,d':['堂侄孙女'],
'f,xb,s,s,d,h':['堂侄孙婿'], 'f,xb,s,s,d,h':['堂侄孙婿'],
'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'], 'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'],
'f,xb,s,d,h':['堂侄婿','从父侄婿','叔伯侄婿'], 'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'],
'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'], 'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'],
'f,xb,d&o,h':['堂姐夫'], 'f,xb,d&o,h':['堂姐夫'],
'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'], 'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'],

1
tests/test.js
View File

@ -16,6 +16,7 @@ test('relationship.js show to be tested', function (t) {
t.deepEqual(relationship({text:'哥哥的弟弟的爸爸的儿子',sex:1}),['兄弟','自己']); t.deepEqual(relationship({text:'哥哥的弟弟的爸爸的儿子',sex:1}),['兄弟','自己']);
t.deepEqual(relationship({text:'爸爸的舅舅',sex:0,reverse:true}),['甥孙女']); t.deepEqual(relationship({text:'爸爸的舅舅',sex:0,reverse:true}),['甥孙女']);
t.deepEqual(relationship({text:'舅爷爷',type:'chain'}),['爸爸的妈妈的兄弟']); t.deepEqual(relationship({text:'舅爷爷',type:'chain'}),['爸爸的妈妈的兄弟']);
t.deepEqual(relationship({text:'堂兄弟的孩子',sex:1}),['堂侄','堂侄女']);
t.end(); t.end();
}); });