修复正则匹配bug
This commit is contained in:
8
dist/relationship.js
vendored
8
dist/relationship.js
vendored
@@ -166,7 +166,7 @@
|
||||
str:''
|
||||
},
|
||||
{//并列关系处理1
|
||||
exp:/(.+)?\[([^\|]+?)\|(.+?\|.+?)?\](.+)?/g,
|
||||
exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)?\](.+)?/g,
|
||||
str:'$1$2$4#$1[$3]$4'
|
||||
},
|
||||
{//并列关系处理2
|
||||
@@ -634,14 +634,14 @@
|
||||
'f,xb,s&o,w':['堂嫂'],
|
||||
'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'],
|
||||
'f,xb,s&l,w':['堂弟媳','堂弟妹'],
|
||||
'f,xb,s,s':['堂侄男','堂侄子','从父侄男','叔伯侄男','堂侄'],
|
||||
'f,xb,s,s,w':['堂侄妇','从父侄妇','叔伯侄父'],
|
||||
'f,xb,s,s':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'],
|
||||
'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'],
|
||||
'f,xb,s,s,s':['堂侄孙男'],
|
||||
'f,xb,s,s,s,w':['堂侄孙妇'],
|
||||
'f,xb,s,s,d':['堂侄孙女'],
|
||||
'f,xb,s,s,d,h':['堂侄孙婿'],
|
||||
'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'],
|
||||
'f,xb,s,d,h':['堂侄婿','从父侄婿','叔伯侄婿'],
|
||||
'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'],
|
||||
'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'],
|
||||
'f,xb,d&o,h':['堂姐夫'],
|
||||
'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'],
|
||||
|
||||
4
dist/relationship.min.js
vendored
4
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user