updated 配置及注解调整

This commit is contained in:
mumuy
2022-07-08 08:34:37 +08:00
parent 8e72cbdb88
commit 0bee076ec8
9 changed files with 14 additions and 10 deletions

View File

@@ -111,9 +111,9 @@ export default {
'f,{G1},d':['姑母','姑姑','姑妈','姑'],
'f,{G1},d,h':['姑父'],
'm,{G1},s':['舅父','舅舅','舅爸','舅'],
'm,{G1},s,w':['舅母','舅妈'],
'm,{G1},d':['姨母','姨姨','姨妈','姨'],
'm,{G1},d,h':['姨父','姨爸','姨丈'],
'm,{G1},s,w':['舅母','舅妈'],
'm,{G1},d':['姨母','姨姨','姨妈','姨'],
'm,{G1},d,h':['姨父','姨爸','姨丈'],
// 同辈及以下
'{G1},[s&o|s&l]':['兄弟'],
'{G1},[s&o|s&l],w':['兄弟妇'],

View File

@@ -105,6 +105,7 @@ export default {
'[f,xs|m,xb],s&o':['姑舅哥','姑舅哥哥'],
'[f,xs|m,xb],s&l':['姑舅弟','姑舅弟弟'],
'[f,xs|m,xb],d':['姑舅姊妹','舅姑姊妹'],
'w,[f,xs|m,xb],d':['姑舅姨子'],
'w,[f,xs|m,xb],d,h':['姑舅连襟','姑舅连桥'],
'[f,xs|m,xb],d&o':['姑舅姐','姑舅姐姐'],
'[f,xs|m,xb],d&l':['姑舅妹','姑舅妹妹'],

View File

@@ -1,8 +1,9 @@
// 默认完整映射关系
import _main from './main';
import _prefix from './prefix';
import _branch from './branch';
var _map = {}; // 默认映射关系
var _map = {};
// 分支关系
for(var key in _branch){

View File

@@ -1,3 +1,4 @@
// 通用方法
import _filter from './filter';
import _map from './map';

View File

@@ -1,4 +1,4 @@
// 分支关系链
// 分支前缀
export default {
'{G2}':{
'f,f,xb':['从祖'],