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

updated 重表关系添加，检索优化

Browse Source 
增加快速检索功能
This commit is contained in:
PASSER-BY
2022-12-09 00:32:43 +08:00
parent 470ee24c45
commit 8e0475864a
10 changed files with 142 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/module/data/branch.js
View File

@@ -7,36 +7,14 @@ export default {
'{G2},w':['祖母'],
'{G2},s':['父'],
'{G2},s,w':['母'],
'{G2},s,s':['兄弟'],
'{G2},s,s&o':['兄'],
'{G2},s,s&l':['弟'],
'{G2},s,s':['兄弟'],
'{G2},s,d':['姊妹'],
'{G2},s,d&o':['姊'],
'{G2},s,d&l':['妹'],
'{G2},s,d':['姊妹'],
'{G2},s,s,s':['男','子'],
'{G2},s,s,d':['女'],
'{G2C},s&o':['伯父'],
'{G2C},s&o,w':['伯母'],
'{G2C},s&l':['叔父'],
'{G2C},s&l,w':['叔母'],
'{G2C},s,s&o':['兄'],
'{G2C},s,s&l':['弟'],
'{G2C},s,s,s':['侄男'],
'{G2C},s,s,d':['侄女'],
'{G2C},s,d&o':['姐'],
'{G2C},s,d&l':['妹'],
'{G2C},s,d,s':['甥男'],
'{G2C},s,d,d':['甥女'],
'{G2C},d':['姑母'],
'{G2C},d,h':['姑父'],
'{G2C},d,s&o':['兄'],
'{G2C},d,s&l':['弟'],
'{G2C},d,s,s':['侄男'],
'{G2C},d,s,d':['侄女'],
'{G2C},d,d&o':['姐'],
'{G2C},d,d&l':['妹'],
'{G2C},d,d,s':['甥男'],
'{G2C},d,d,d':['甥女'],
// 高祖以上
'f,f,f,f,f,f,f,f,{G1M}':['鼻祖父'],
'f,f,f,f,f,f,f,f,{G1M},w':['鼻祖母'],
@@ -125,8 +103,8 @@ export default {
'f,f,{G1},d,h':['姑祖父','姑爷爷'],
'f,m,{G1},s':['舅祖父','舅爷爷'],
'f,m,{G1},s,w':['舅祖母','舅奶奶'],
'f,m,{G1},d':['姨祖母','姨爷爷'],
'f,m,{G1},d,h':['姨祖父','姨奶奶'],
'f,m,{G1},d':['姨祖母','姨奶奶'],
'f,m,{G1},d,h':['姨祖父','姨爷爷'],
'm,f,{G1},s&o':['伯外祖父','伯外公','伯姥爷'],
'm,f,{G1},s&o,w':['伯外祖母','伯外婆','伯姥姥'],
'm,f,{G1},s&l':['叔外祖父','叔外公','叔姥爷'],

14
src/module/data/prefix.js
View File

@@ -2,10 +2,6 @@
* 分支前缀 - 旁支亲戚的分支节点
*/
export default {
'{G2C}':{
'[f|m],[f|m],[f|m],[f,xs|m,xb|m,xs],[s|d],[s|d]':['重表'], // 曾祖辈的表兄弟姐妹的子女
'[f|m],[f|m],[f,xs|m,xb|m,xs],[s|d]':['重表'], // 祖辈的表兄弟姐妹的子女
},
'{G2}':{
'f,f,xb':['从祖'],
'm,f,xb':['外从祖'],
@@ -35,6 +31,8 @@ export default {
'm,m,m,xs,d,d':['三从母','三从'],
'f,f,f,f,xb,s,s,s':['四从父','三从堂','远堂','族','四从'],
'm,m,m,m,xs,d,d,d':['四从母','四从'],
'[f|m],[f|m],[f|m],[f,xs|m,xb],[s|d],[s|d],[s|d]':['重表'],
'[f|m],[f|m],[f,xs|m,xb],[s|d],[s|d]':['重表'],
},
'{G1M}':{
'f,ob':['伯'],
@@ -57,6 +55,12 @@ export default {
'm,f,xs,s':['姑表舅'],
'm,m,xb,s':['舅表舅'],
'm,m,xs,s':['姨舅','从母舅'],
'f,[f|m],[f|m],[f,xs|m,xb],[s|d],[s|d],s&o':['重表伯'],
'f,[f|m],[f|m],[f,xs|m,xb],[s|d],[s|d],s&l':['重表叔'],
'f,[f|m],[f,xs|m,xb],[s|d],s&o':['重表伯'],
'f,[f|m],[f,xs|m,xb],[s|d],s&l':['重表叔'],
'm,[f|m],[f|m],[f,xs|m,xb],[s|d],[s|d],s':['重表舅'],
'm,[f|m],[f,xs|m,xb],[s|d],s':['重表舅'],
},
'{G1W}':{
'f,xs':['姑'],
@@ -70,6 +74,8 @@ export default {
'm,f,xs,d':['姑表姨'],
'm,m,xb,d':['舅表姨'],
'm,m,xs,d':['姨姨','从母姨'],
'f,[f|m],[f|m],[f,xs|m,xb],[s|d],[s|d],d':['重表姑'],
'm,[f|m],[f|m],[f,xs|m,xb],[s|d],[s|d],d':['重表姨'],
},
'{G0}':{
'xb':['侄'],